svn commit: r51359 - in head/ja_JP.eucJP: htdocs/copyright share/xml

Ryusuke SUZUKI ryusuke at FreeBSD.org
Tue Jan 2 08:53:07 UTC 2018


Author: ryusuke
Date: Tue Jan  2 08:53:05 2018
New Revision: 51359
URL: https://svnweb.freebsd.org/changeset/doc/51359

Log:
  - Merge the following from the English version:
  
  	r49777 -> r51353	head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml
  	r38745 -> r51230	head/ja_JP.eucJP/htdocs/copyright/trademarks.xml
  	r49777 -> r51353	head/ja_JP.eucJP/share/xml/header.l10n.ent

Modified:
  head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml
  head/ja_JP.eucJP/htdocs/copyright/trademarks.xml
  head/ja_JP.eucJP/share/xml/header.l10n.ent

Modified: head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml	Tue Jan  2 08:39:19 2018	(r51358)
+++ head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml	Tue Jan  2 08:53:05 2018	(r51359)
@@ -4,7 +4,7 @@
 <!ENTITY title "The FreeBSD Copyright">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r49777 -->
+<!-- Original revision: r51353 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -17,7 +17,7 @@
 
     <p>ÌõÃí : °Ê²¼¤Ï FreeBSD ¤Î license ¤Î¸¶Ê¸¤Ç¤¹¡£</p>
 
-    <p>Copyright 1992-2017
+    <p>Copyright 1992-2018
       The FreeBSD Project.
       All rights reserved.</p>
 
@@ -60,7 +60,7 @@
     <p>°Ê²¼¤ÎÆüËܸìÌõ¤Ï»²¹Í¤Î¤¿¤á¤ËźÉÕ¤·¤¿¤â¤Î¤Ç¤¹¡£
        ±Ñ¸ìÈǤÀ¤±¤¬Ë¡Î§Åª¤ËÍ­¸ú¤Ç¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
 
-    <p>Copyright 1992-2017
+    <p>Copyright 1992-2018
       The FreeBSD Project.
       All rights reserved.</p>
 

Modified: head/ja_JP.eucJP/htdocs/copyright/trademarks.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/copyright/trademarks.xml	Tue Jan  2 08:39:19 2018	(r51358)
+++ head/ja_JP.eucJP/htdocs/copyright/trademarks.xml	Tue Jan  2 08:53:05 2018	(r51359)
@@ -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 "ÅÐÏ¿¾¦É¸">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.20 -->
+<!-- Original revision: r51230 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -20,9 +20,9 @@
 <p>FreeBSD Logo ¤Ï FreeBSD Foundation ¤Î¾¦É¸¤Ç¤¹¡£</p>
 
 <p>FreeBSD ¥Þ¡¼¥¯¤ÎÍøÍѤ˴ؤ·¤Æ¤Ï¡¢
-  <a href="http://www.freebsdfoundation.org/">FreeBSD
+  <a href="https://www.freebsdfoundation.org/">FreeBSD
   Foundation</a> ¤Î <a
-    href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">Trademark
+    href="https://www.freebsdfoundation.org/legal/trademark-usage-terms-and-conditions/">Trademark
   Usage Terms and Conditions</a> ¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
 
 <p>Adobe, Acrobat, Acrobat Reader ¤ª¤è¤Ó PostScript

Modified: head/ja_JP.eucJP/share/xml/header.l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/header.l10n.ent	Tue Jan  2 08:39:19 2018	(r51358)
+++ head/ja_JP.eucJP/share/xml/header.l10n.ent	Tue Jan  2 08:53:05 2018	(r51359)
@@ -5,10 +5,10 @@
 <!-- PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN" -->
 
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r49777 -->
+<!-- Original revision: r51353 -->
 
 <!ENTITY copyright '<span xmlns="http://www.w3.org/1999/xhtml"><a href="&base;/search/index-site.html">¥µ¥¤¥È¥Þ¥Ã¥×</a> |
-  <a href="&base;/copyright/">ÃÎŪºâ»º¸¢¤Ë¤Ä¤¤¤Æ</a> | <!-- © -->(C) 1995–2017 The FreeBSD Project.
+  <a href="&base;/copyright/">ÃÎŪºâ»º¸¢¤Ë¤Ä¤¤¤Æ</a> | <!-- © -->(C) 1995–2018 The FreeBSD Project.
   All rights reserved.</span>'>
 <!ENTITY author '<a href="&base;/index.html">¥Û¡¼¥à</a>   |   <a href="&base;/mailto.html">Ï¢ÍíÀè</a>   |   <a href="&base;/copyright/index.html">ÃÎŪºâ»º¸¢¤Ë¤Ä¤¤¤Æ</a>   |   ©right;'>
 


More information about the svn-doc-all mailing list