Date: Fri, 4 Oct 2013 07:32:03 -0700 (PDT) From: Dru Lavigne <dru.lavigne@att.net> To: Dru Lavigne <dru@FreeBSD.org>, "doc-committers@freebsd.org" <doc-committers@freebsd.org>, "svn-doc-all@freebsd.org" <svn-doc-all@freebsd.org>, "svn-doc-head@freebsd.org" <svn-doc-head@freebsd.org> Subject: Re: svn commit: r42824 - head/share/xml Message-ID: <1380897123.24497.YahooMailNeo@web184901.mail.gq1.yahoo.com> In-Reply-To: <201310041429.r94ETvaF007664@svn.freebsd.org> References: <201310041429.r94ETvaF007664@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Sorry, forgot to include this in the commit message: Approved by: gjb (mentor) Cheers, Dru >________________________________ > From: Dru Lavigne <dru@FreeBSD.org> >To: doc-committers@freebsd.org; svn-doc-all@freebsd.org; svn-doc-head@freebsd.org >Sent: Friday, October 4, 2013 10:29 AM >Subject: svn commit: r42824 - head/share/xml > > >Author: dru >Date: Fri Oct 4 14:29:57 2013 >New Revision: 42824 >URL: http://svnweb.freebsd.org/changeset/doc/42824 > >Log: > Flash is now a registered trademark. > >Modified: > head/share/xml/trademarks.ent > >Modified: head/share/xml/trademarks.ent >============================================================================== >--- head/share/xml/trademarks.ent Fri Oct 4 13:55:03 2013 (r42823) >+++ head/share/xml/trademarks.ent Fri Oct 4 14:29:57 2013 (r42824) >@@ -211,7 +211,7 @@ Coverity, Inc.</para>"> ><!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, and Shockwave are > trademarks or registered trademarks of Macromedia, Inc. in the > United States and/or other countries.</para>"> >-<!ENTITY flash "<trademark>Flash</trademark>"> >+<!ENTITY flash "<trademark class='registered'>Flash</trademark>"> ><!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> ><!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>"> > >_______________________________________________ >svn-doc-head@freebsd.org mailing list >http://lists.freebsd.org/mailman/listinfo/svn-doc-head >To unsubscribe, send any mail to "svn-doc-head-unsubscribe@freebsd.org" > > > From owner-svn-doc-head@FreeBSD.ORG Fri Oct 4 15:08:22 2013 Return-Path: <owner-svn-doc-head@FreeBSD.ORG> Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1A6C921D; Fri, 4 Oct 2013 15:08:22 +0000 (UTC) (envelope-from ryusuke@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EBB02232D; Fri, 4 Oct 2013 15:08:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r94F8LOv033038; Fri, 4 Oct 2013 15:08:21 GMT (envelope-from ryusuke@svn.freebsd.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r94F8Lej033037; Fri, 4 Oct 2013 15:08:21 GMT (envelope-from ryusuke@svn.freebsd.org) Message-Id: <201310041508.r94F8Lej033037@svn.freebsd.org> From: Ryusuke SUZUKI <ryusuke@FreeBSD.org> Date: Fri, 4 Oct 2013 15:08:21 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r42825 - head/ja_JP.eucJP/htdocs X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the doc tree for head <svn-doc-head.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>, <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>; List-Post: <mailto:svn-doc-head@freebsd.org> List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>, <mailto:svn-doc-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 04 Oct 2013 15:08:22 -0000 Author: ryusuke Date: Fri Oct 4 15:08:21 2013 New Revision: 42825 URL: http://svnweb.freebsd.org/changeset/doc/42825 Log: - Merge the following from the English version: r41116 -> r42819 head/ja_JP.eucJP/htdocs/index.xsl Modified: head/ja_JP.eucJP/htdocs/index.xsl Modified: head/ja_JP.eucJP/htdocs/index.xsl =============================================================================--- head/ja_JP.eucJP/htdocs/index.xsl Fri Oct 4 14:29:57 2013 (r42824) +++ head/ja_JP.eucJP/htdocs/index.xsl Fri Oct 4 15:08:21 2013 (r42825) @@ -5,7 +5,7 @@ ]> <!-- $FreeBSD$ --> -<!-- Original revision: r41116 --> +<!-- Original revision: r42819 --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -38,25 +38,19 @@ <div id="frontfeatureleft"> <div id="frontfeaturecontent"> - <h1> - ¥Ù¡¼¥¹¤Ï BSD UNIX<!-- &unix; -->(R) - </h1> + <h1>&os; ¥×¥í¥¸¥§¥¯¥È</h1> - <p>FreeBSD<!-- ® -->(R) ¤Ï¡¢ºÇ¿·¤Î¥µ¡¼¥Ð¡¢¥Ç¥¹¥¯¥È¥Ã¥×¤ª¤è¤ÓÁȤ߹þ¤ß + <p>&os; ¤Ï¡¢ºÇ¿·¤Î¥µ¡¼¥Ð¡¢¥Ç¥¹¥¯¥È¥Ã¥×¤ª¤è¤ÓÁȤ߹þ¤ß <a href="&base;/platforms/">¥×¥é¥Ã¥È¥Õ¥©¡¼¥à</a> ÍѤιâÀǽ¤Ê¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¤¹¡£ - FreeBSD ¤Î¥³¡¼¥É¥Ù¡¼¥¹¤Ï¡¢ - 30 ǯ°Ê¾å¤Ë¤âÅϤäƳ«È¯¡¢²þÎÉ¡¢ºÇŬ²½¤¬Â³¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£ - <a href="&enbase;/doc/ja_JP.eucJP/articles/contributors/staff-committers.html" - >¿¤¯¤Î¿Í¡¹¤¬»²²Ã¤¹¤ë³«È¯¼Ô¥Á¡¼¥à</a> - ¤¬³«È¯¡¦Êݼé¤ò¤ª¤³¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ - FreeBSD ¤Ï¹âÅ٤ʥͥåȥ¥¯¡¢·ø¸Ç¤Ê¥»¥¥å¥ê¥Æ¥£µ¡Ç½¡¢ - À¤³¦ºÇÂ祯¥é¥¹¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤òÄ󶡤·¡¢ - À¤³¦ºÇÂ絬ÌϤΠ<a - href = "&enbase;/doc/ja_JP.eucJP/books/handbook/nutshell.html#introduction-nutshell-users">¥¦¥§¥Ö¥µ¥¤¥È</a> ¤ä¡¢ + ¿¤¯¤Î <a href="&enbase;/doc/ja_JP.eucJP/articles/contributors/staff-committers.html">¥³¥ß¥å¥Ë¥Æ¥£</a> + ¤¬ 30 ǯ°Ê¾å¤Ë¤âÅϤäƳ«È¯¤ò³¤±¤Æ¤¤¤Þ¤¹¡£ + ¹âÅ٤ʥͥåȥ¥¯¡¢¥»¥¥å¥ê¥Æ¥£¡¢ + ¤ª¤è¤Ó¥¹¥È¥ì¡¼¥¸µ¡Ç½¤Ë¤è¤ê¡¢ + &os; ¤Ï¿ô¿¤¯¤Î <a + href = "&enbase;/doc/ja_JP.eucJP/books/handbook/nutshell.html#introduction-nutshell-users">ºÇÂ絬ÌϤΥ¦¥§¥Ö¥µ¥¤¥È</a>¡¢ ¹¤¯ÉáµÚ¤·¤Æ¤¤¤ëÁȤ߹þ¤ß¥Í¥Ã¥È¥ï¡¼¥¯µ¡´ï¡¢ - ¥¹¥È¥ì¡¼¥¸¥Ç¥Ð¥¤¥¹¤ÇÍøÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£ - </p> + ¥¹¥È¥ì¡¼¥¸¥Ç¥Ð¥¤¥¹¤Ë¤ª¤¤¤ÆÍøÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£</p> <div id="txtfrontfeaturelink"> »<a href="&base;/about.html" title="¾Ü¤·¤¯¤Ï¤³¤Á¤é">¾Ü¤·¤¯¤Ï¤³¤Á¤é</a> @@ -69,7 +63,7 @@ <div class="frontgettop"><div> </div> </div> <div class="frontgetcontent"> - <a href="&base;/where.html">FreeBSD ¤òÆþ¼ê¤¹¤ë</a> + <a href="&base;/where.html">&os; ¤òÆþ¼ê¤¹¤ë</a> </div> <!-- frontgetcontent --> <div class="frontgetbot"><div> </div> </div> @@ -174,7 +168,7 @@ <div class="frontnewroundbox"> <div class="frontnewtop"><div> </div> </div> <div class="frontnewcontent"> - <a href="&base;/projects/newbies.html">FreeBSD ¤¬½é¤á¤Æ¤È¤¤¤¦Êý¤Ï¡¢¤³¤Á¤é¤Ø¤É¤¦¤¾</a> + <a href="&base;/projects/newbies.html">FreeBSD ¤¬½é¤á¤Æ¤ÎÊý</a> </div> <!-- frontnewcontent --> <div class="frontnewbot"><div> </div> </div> </div> <!-- frontnewroundbox -->
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1380897123.24497.YahooMailNeo>