PERFORCE change 149324 for review

Gabor Pali pgj at FreeBSD.org
Sat Sep 6 15:40:43 UTC 2008 

http://perforce.freebsd.org/chv.cgi?CH=149324

Change 149324 by pgj at kolbasz on 2008/09/06 15:40:41

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#13 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/jpaetzel.key#1 branch
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#10 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#10 integrate
.. //depot/projects/docproj_hu/www/en/developers.sgml#11 integrate
.. //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#2 integrate
.. //depot/projects/docproj_hu/www/hu/administration.sgml#11 integrate
.. //depot/projects/docproj_hu/www/share/sgml/events.xml#6 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#17 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#13 (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.460 2008/08/25 22:03:59 makc Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.461 2008/09/05 21:35:59 jpaetzel Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -532,6 +532,8 @@
 
 <!ENTITY a.josef "Josef El-Rayes <email>josef at FreeBSD.org</email>">
 
+<!ENTITY a.jpaetzel "Josh Paetzel <email>jpaetzel at FreeBSD.org</email>">
+
 <!ENTITY a.jseger "Justin Seger <email>jseger at FreeBSD.org</email>">
 
 <!ENTITY a.julian "Julian Elischer <email>julian at FreeBSD.org</email>">

==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#10 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.79 2008/08/31 13:59:06 yar Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.80 2008/09/05 22:44:17 jpaetzel Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -874,6 +874,11 @@
       &pgpkey.philip;
     </sect2>
 
+    <sect2 id="pgpkey-jpaetzel">
+      <title>&a.jpaetzel;</title>
+      &pgpkey.jpaetzel;
+    </sect2>
+
     <sect2 id="pgpkey-pgj">
       <title>&a.pgj;</title>
       &pgpkey.pgj;

==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#10 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.176 2008/08/31 13:59:06 yar Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.177 2008/09/05 22:44:17 jpaetzel Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -132,6 +132,7 @@
 <!ENTITY pgpkey.johans SYSTEM "johans.key">
 <!ENTITY pgpkey.jon SYSTEM "jon.key">
 <!ENTITY pgpkey.josef SYSTEM "josef.key">
+<!ENTITY pgpkey.jpaetzel SYSTEM "jpaetzel.key">
 <!ENTITY pgpkey.jylefort SYSTEM "jylefort.key">
 <!ENTITY pgpkey.kaiw SYSTEM "kaiw.key">
 <!ENTITY pgpkey.ken SYSTEM "ken.key">

==== //depot/projects/docproj_hu/www/en/developers.sgml#11 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.203 2008/08/25 22:28:15 makc Exp $
+$FreeBSD: www/en/developers.sgml,v 1.204 2008/09/05 21:55:07 jpaetzel Exp $
 
 -->
 
@@ -267,6 +267,7 @@
 <!ENTITY a.john "John Cavanaugh">
 <!ENTITY a.jon "Jonathan Chen">
 <!ENTITY a.josef "Josef El-Rayes">
+<!ENTITY a.jpaetzel "Josh Paetzel">
 <!ENTITY a.jseger "Justin Seger">
 <!ENTITY a.julian "Julian Elischer">
 <!ENTITY a.jvh "Johannes Helander">

==== //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
 <!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/en/releases/6.4R/schedule.sgml,v 1.3 2008/08/31 08:36:38 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/6.4R/schedule.sgml,v 1.4 2008/09/05 19:10:00 hrs Exp $">
 <!ENTITY local.rel "6.4">
 <!ENTITY local.rel.tag "6_4">
 <!ENTITY title "FreeBSD &local.rel; Release Process">
@@ -132,6 +132,7 @@
     <!-- release bits get loaded to avoid network congestion problems -->
     <tr>
       <td>Ports tree tagged</td>
+      <td>15&nbsp;September&nbsp;2008</td>
       <td>--</td>
       <td><tt>RELEASE_&local.rel.tag;_0</tt> tag for <tt>ports/</tt>.</td>
     </tr>

==== //depot/projects/docproj_hu/www/hu/administration.sgml#11 (text+ko) ====

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/hu/administration.sgml,v 1.10 2008/08/12 05:07:13 pgj Exp $">
+<!ENTITY date "$FreeBSD: www/hu/administration.sgml,v 1.11 2008/09/06 15:00:34 pgj Exp $">
 <!ENTITY title "A &os; Projekt szervezeti
   fel&eacute;p&iacute;t&eacute;se">
 <!ENTITY % navinclude.about "INCLUDE">

==== //depot/projects/docproj_hu/www/share/sgml/events.xml#6 (text+ko) ====

@@ -10,7 +10,7 @@
 <events>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/events.xml,v 1.56 2008/09/04 04:56:29 murray Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.57 2008/09/05 01:00:56 murray Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -44,6 +44,27 @@
       to celebrate FreeBSD's 15th Anniversary!</description>
   </event>
 
+  <event id="ticino-2008">
+    <name>Ticino Informatica 2008</name>
+    <startdate>
+      <year>2008</year>
+      <month>10</month>
+      <day>22</day>
+    </startdate>
+    <enddate>
+      <year>2008</year>
+      <month>10</month>
+      <day>25</day>
+    </enddate>
+    <location>
+      <country code="CH">Switzerland</country>
+      <city>Lugano</city>
+      <site>Palazzo dei Congressi</site>
+    </location>
+    <description>FreeBSD and The FreeBSD Foundation
+      Stand A13 Presented by OEMS Sagl</description>
+  </event>
+
   <event id="eurobsdcon-2008">
     <name>EuroBSDCon 2008</name>
     <url>http://2008.eurobsdcon.org/</url>
@@ -95,6 +116,28 @@
       (NYC*BUG).</description>
   </event>
 
+  <event id="openexpo-2008">
+    <name>OpenExpo 2008</name>
+    <url>http://www.openexpo.ch/</url>
+    <startdate>
+      <year>2008</year>
+      <month>9</month>
+      <day>24</day>
+    </startdate>
+    <enddate>
+      <year>2008</year>
+      <month>9</month>
+      <day>25</day>
+    </enddate>
+    <location>
+      <country code="CH">Switzerland</country>
+      <city>Zurich</city>
+    </location>
+    <description>The goal of OpenExpo is the promotion of Open Source
+      software in the business environment.  Among many others, there
+      will be a FreeBSD booth.</description>
+  </event>
+
   <event id="coscup-2008">
     <name>COSCUP 2008 - Conference for Open Source Coders, Users and Promoters</name>
     <url>http://coscup.org/2008/</url>

==== //depot/projects/docproj_hu/www/share/sgml/news.xml#17 (text+ko) ====

@@ -20,7 +20,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/news.xml,v 1.192 2008/08/25 23:40:56 stas Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.193 2008/09/05 22:28:12 jpaetzel Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -28,6 +28,17 @@
     <name>2008</name>
 
     <month>
+      <name>9</name>
+      <day>
+        <name>5</name>
+        <event>
+	  <p>New committer: <a href="mailto:jpaetzel at FreeBSD.org">Josh Paetzel</a>
+	    (ports)</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>8</name>
       <day>
         <name>26</name>

More information about the p4-projects mailing list