From owner-p4-projects@FreeBSD.ORG  Wed May  5 11:02:29 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E8BFB1065676; Wed,  5 May 2010 11:02:28 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 92B18106566C
	for <perforce@FreeBSD.org>; Wed,  5 May 2010 11:02:28 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 8084E8FC19
	for <perforce@FreeBSD.org>; Wed,  5 May 2010 11:02:28 +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 o45B2S97089361
	for <perforce@FreeBSD.org>; Wed, 5 May 2010 11:02:28 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o45B2Stx089359
	for perforce@freebsd.org; Wed, 5 May 2010 11:02:28 GMT
	(envelope-from rene@FreeBSD.org)
Date: Wed, 5 May 2010 11:02:28 GMT
Message-Id: <201005051102.o45B2Stx089359@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 177754 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 May 2010 11:02:29 -0000

http://p4web.freebsd.org/@@177754?ac=10

Change 177754 by rene@rene_acer on 2010/05/05 11:02:18

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/p4-primer/article.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#13 edit
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#23 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#36 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#33 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/romain.key#1 branch

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/p4-primer/article.sgml#4 (text+ko) ====

@@ -23,7 +23,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.11 2008/08/06 22:03:49 pgj Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.12 2010/05/03 21:04:08 rene Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#13 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.94 2010/04/30 12:59:52 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.95 2010/04/30 16:11:49 rene Exp $
 -->
 
 <chapter id="desktop">
@@ -1088,7 +1088,7 @@
 	  <row>
             <entry><application>OpenOffice.org</application></entry>
 	    <entry><literal>openoffice</literal></entry>
-	    <entry><filename role="package">editors/openoffice-3</filename></entry>
+	    <entry><filename role="package">editors/openoffice.org-3</filename></entry>
 	  </row>
 
 	  <row>

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#23 (text+ko) ====

@@ -1,10 +1,10 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.21 2009/08/26 06:04:09 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.23 2010/04/30 16:13:16 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
-     %SRCID%	1.94
+     %SRCID%	1.95
 -->
 
 <chapter id="desktop">

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#36 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.122 2010/04/20 22:31:46 rstone Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.123 2010/05/01 09:40:02 romain Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -1391,6 +1391,11 @@
       &pgpkey.tota;
     </sect2>
 
+    <sect2 id="pgpkey-romain">
+      <title>&a.romain;</title>
+      &pgpkey.romain;
+    </sect2>
+
     <sect2 id="pgpkey-sylvio">
       <title>&a.sylvio;</title>
       &pgpkey.sylvio;

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#33 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.214 2010/04/20 22:31:46 rstone Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.215 2010/05/01 09:40:02 romain Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -261,6 +261,7 @@
 <!ENTITY pgpkey.roam SYSTEM "roam.key">
 <!ENTITY pgpkey.roberto SYSTEM "roberto.key">
 <!ENTITY pgpkey.rodrigc SYSTEM "rodrigc.key">
+<!ENTITY pgpkey.romain SYSTEM "romain.key">
 <!ENTITY pgpkey.rpaulo SYSTEM "rpaulo.key">
 <!ENTITY pgpkey.rrs SYSTEM "rrs.key">
 <!ENTITY pgpkey.rstone SYSTEM "rstone.key">