svn commit: r43851 - in head/ja_JP.eucJP/htdocs/java: . dists

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sun Feb 9 08:19:56 UTC 2014 

Author: ryusuke
Date: Sun Feb  9 08:19:54 2014
New Revision: 43851
URL: http://svnweb.freebsd.org/changeset/doc/43851

Log:
  - Merge the following from the English version:
  
  	r42048 -> r43646	head/ja_JP.eucJP/htdocs/java/Makefile
  	r42026 -> r43646	head/ja_JP.eucJP/htdocs/java/dists/index.xml
  	r42047 -> r43646	head/ja_JP.eucJP/htdocs/java/index.xml
  	r42154 -> r43646	head/ja_JP.eucJP/htdocs/java/install.xml
  	r31298 -> (dead)	head/ja_JP.eucJP/htdocs/java/java-rss.xsl
  	r24043 -> (dead)	head/ja_JP.eucJP/htdocs/java/links.xml
  	r41555 -> (dead)	head/ja_JP.eucJP/htdocs/java/news.xml
  	r31289 -> (dead)	head/ja_JP.eucJP/htdocs/java/newsflash.xsl

Deleted:
  head/ja_JP.eucJP/htdocs/java/java-rss.xsl
  head/ja_JP.eucJP/htdocs/java/links.xml
  head/ja_JP.eucJP/htdocs/java/news.xml
  head/ja_JP.eucJP/htdocs/java/newsflash.xsl
Modified:
  head/ja_JP.eucJP/htdocs/java/Makefile
  head/ja_JP.eucJP/htdocs/java/dists/index.xml
  head/ja_JP.eucJP/htdocs/java/index.xml
  head/ja_JP.eucJP/htdocs/java/install.xml

Modified: head/ja_JP.eucJP/htdocs/java/Makefile
==============================================================================
--- head/ja_JP.eucJP/htdocs/java/Makefile	Sun Feb  9 04:05:25 2014	(r43850)
+++ head/ja_JP.eucJP/htdocs/java/Makefile	Sun Feb  9 08:19:54 2014	(r43851)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 # The FreeBSD Japanese Documentation Project
-# Original revision: r42048
+# Original revision: r43646
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -14,10 +14,5 @@ SUBDIR =	dists
 DOCS+=  howhelp.xml
 DOCS+=  index.xml
 DOCS+=  install.xml
-DOCS+=	links.xml
-
-XML.DEFAULT=	news.xml
-XMLDOCS=	newsflash
-XMLDOCS+=	news:java-rss.xsl::rss.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"

Modified: head/ja_JP.eucJP/htdocs/java/dists/index.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/java/dists/index.xml	Sun Feb  9 04:05:25 2014	(r43850)
+++ head/ja_JP.eucJP/htdocs/java/dists/index.xml	Sun Feb  9 08:19:54 2014	(r43851)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
+"http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title "FreeBSD &java; Project: Distributions">
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r42026 -->
+<!-- Original revision: r43646 -->
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -36,12 +36,12 @@
 <h3>&jdk; 1.6.x</h3>
 <p><a href="&enbase;/java/16.html">JDK 1.6</a> ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
   ¸½ºßÂбþ¤·¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤Ï (i386 ¤ª¤è¤Ó amd64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤÎ)
-  FreeBSD 6.2 °Ê¹ß¤Ç¤¹¡£</p>
+  FreeBSD 8.4 °Ê¹ß¤Ç¤¹¡£</p>
 
 <h3>&jdk; 1.7.x</h3>
 <p><a href="&enbase;/java/17.html">JDK 1.7</a> ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
   ¸½ºßÂбþ¤·¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤Ï (i386 ¤ª¤è¤Ó amd64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤÎ)
-  FreeBSD 7.0 °Ê¹ß¤Ç¤¹¡£</p>
+  FreeBSD 8.4 °Ê¹ß¤Ç¤¹¡£</p>
 
 </td>
 </tr>

Modified: head/ja_JP.eucJP/htdocs/java/index.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/java/index.xml	Sun Feb  9 04:05:25 2014	(r43850)
+++ head/ja_JP.eucJP/htdocs/java/index.xml	Sun Feb  9 08:19:54 2014	(r43851)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
+"http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title "FreeBSD &java; ¥×¥í¥¸¥§¥¯¥È">
 <!ENTITY url.books "../../../doc/en_US.ISO8859-1/books">
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r42047 -->
+<!-- Original revision: r43646 -->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -28,7 +28,7 @@
     (¤½¤ì¤¾¤ì <code>openjdk6</code> ¤È <code>openjdk7</code>) ¤òÍѤ¤¤Æ¡¢
     ¥½¡¼¥¹¥³¡¼¥É¤«¤é¹½ÃÛ¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£
     ¤½¤·¤Æ¡¢¥³¥ó¥Ñ¥¤¥ëºÑ¤ß¤Î¥Ð¥¤¥Ê¥ê package ¤¬ FreeBSD mirrors ¤òÄ̤¸¤ÆÇÛÉÛ¤µ¤ì¤Æ¤ª¤ê¡¢
-    <code>pkg_add(1)</code> ¤òÍѤ¤¤ÆľÀÜ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
+    <code>pkg(8)</code> ¤òÍѤ¤¤ÆľÀÜ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
 
   <p>&openjdk; ¤Ï¡¢FreeBSD ¤Ë¤ª¤¤¤Æ¿ä¾©¤µ¤ì¤ë &java; ¤Î¼ÂÁõ¤Ç¤¹¡£
     FreeBSD Foundation ¤Ï¡¢º£¸å Sun ¤Î¥Ñ¡¼¥È¥Ê¡¼¥½¡¼¥¹¥Ù¡¼¥¹¤Î
@@ -41,12 +41,6 @@
     <a href="http://www.FreeBSDFoundation.org/java">FreeBSD
       Foundation Java ¥À¥¦¥ó¥í¡¼¥É</a> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
 
-  <h2>¥Ë¥å¡¼¥¹</h2>
-
-  <ul>
-    <li><a href="newsflash.html">¥¢¥Ê¥¦¥ó¥¹</a></li>
-  </ul>
-
   <h2><b>¥½¥Õ¥È¥¦¥§¥¢</b></h2>
 
   <ul>
@@ -66,7 +60,6 @@
 
   <ul>
     <li><a href="&url.books;/porters-handbook/using-java.html">ports ¤òºî¤ë¡£</a></li>
-    <li><a href="links.html">¥ê¥ó¥¯</a></li>
   </ul>
 
   </body>

Modified: head/ja_JP.eucJP/htdocs/java/install.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/java/install.xml	Sun Feb  9 04:05:25 2014	(r43850)
+++ head/ja_JP.eucJP/htdocs/java/install.xml	Sun Feb  9 08:19:54 2014	(r43851)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
+"http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title "FreeBSD &java; Project: How To Install">
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r42154 -->
+<!-- Original revision: r43646 -->
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
@@ -25,9 +25,19 @@
           <td>
 	    <h3><a name="openjdk">FreeBSD ¤Î OpenJDK</a></h3>
 
+<p>&openjdk; 6 package ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ï¡¢pkg(8) ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</p>
+
+<p><code>pkg install openjdk6
+</code></p>
+
+<p>pkg(8) ¤Î»ÈÍѤ˴ؤ¹¤ë¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+<a href="../../doc/ja_JP.eucJP/books/handbook/pkgng-intro.html">
+FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯</a> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
+</p>
+
 	    <p>OpenJDK ¤Î FreeBSD ¥Í¥¤¥Æ¥£¥Ö¤Ê port ¤Ç¤¹¡£</p>
 
-	    <p><code>cd /usr/ports/java/openjdk16<br/>
+	    <p><code>cd /usr/ports/java/openjdk17<br/>
               make install clean</code></p>
           </td>
       </tr>

More information about the svn-doc-all mailing list