PERFORCE change 177754 for review

[Rene Ladan]

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

Change 177754 by rene at 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">