From owner-p4-projects@FreeBSD.ORG Sat Mar 6 19:55:58 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 8C9401065674; Sat, 6 Mar 2010 19:55:58 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 4FEE4106564A
for ; Sat, 6 Mar 2010 19:55:58 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 3D3878FC13
for ; Sat, 6 Mar 2010 19:55:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o26JtwLg026043
for ; Sat, 6 Mar 2010 19:55:58 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o26JtvhY026041
for perforce@freebsd.org; Sat, 6 Mar 2010 19:55:57 GMT
(envelope-from pgj@FreeBSD.org)
Date: Sat, 6 Mar 2010 19:55:57 GMT
Message-Id: <201003061955.o26JtvhY026041@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 175405 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sat, 06 Mar 2010 19:55:58 -0000
http://p4web.freebsd.org/chv.cgi?CH=175405
Change 175405 by pgj@Binturong on 2010/03/06 19:55:52
IFC
Affected files ...
.. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#45 integrate
.. //depot/projects/docproj_hu/www/en/art.sgml#2 integrate
.. //depot/projects/docproj_hu/www/en/developers.sgml#40 integrate
.. //depot/projects/docproj_hu/www/en/donations/donors.sgml#28 integrate
.. //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#17 integrate
.. //depot/projects/docproj_hu/www/en/news/2008/Makefile#3 integrate
.. //depot/projects/docproj_hu/www/en/news/2008/press.xml#3 branch
.. //depot/projects/docproj_hu/www/en/news/2009/Makefile#1 branch
.. //depot/projects/docproj_hu/www/en/news/2009/news.xml#1 branch
.. //depot/projects/docproj_hu/www/en/news/Makefile#4 integrate
.. //depot/projects/docproj_hu/www/en/releases/7.3R/schedule.sgml#2 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#30 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#86 integrate
.. //depot/projects/docproj_hu/www/hu/where.sgml#23 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#22 integrate
.. //depot/projects/docproj_hu/www/share/sgml/libcommon.xsl#9 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#86 integrate
.. //depot/projects/docproj_hu/www/share/sgml/notices.xml#7 integrate
.. //depot/projects/docproj_hu/www/share/sgml/press.xml#24 integrate
.. //depot/projects/docproj_hu/www/share/sgml/release.ent#22 integrate
.. //depot/projects/docproj_hu/www/share/sgml/templates.oldnewsflash.xsl#4 integrate
Differences ...
==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#45 (text+ko) ====
@@ -13,7 +13,7 @@
builds for the other languages, and we will poke fun of you
in public.
- $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.498 2010/02/16 13:19:10 linimon Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.499 2010/03/04 02:08:02 neel Exp $
-->
aaron@FreeBSD.org">
@@ -792,6 +792,8 @@
nectar@FreeBSD.org">
+neel@FreeBSD.org">
+
nemoliu@FreeBSD.org">
netchild@FreeBSD.org">
==== //depot/projects/docproj_hu/www/en/art.sgml#2 (text+ko) ====
@@ -1,5 +1,5 @@
+
%developers;
@@ -110,13 +110,23 @@
requires the consent of Brian
Tao (creator of the power
logo) and Marshall Kirk McKusick
- (trademark holder for the BSD Daemon image).
+ (copyright holder for the BSD Daemon image).
&a.phk;'s rendering of the BSD Daemon is released under THE
BEER-WARE LICENSE
. See the README
for more information.
+ Trademarks
+
+ The FreeBSD Foundation
+ holds several FreeBSD related trademarks (among them the
+ trademark for the term FreeBSD
itself). For more
+ information about these trademarks read the
+ FreeBSD Trademark Usage Terms and Conditions.
+
&footer;