PERFORCE change 169635 for review

Gabor Pali pgj at FreeBSD.org
Wed Oct 21 11:16:08 UTC 2009 

http://p4web.freebsd.org/chv.cgi?CH=169635

Change 169635 by pgj at beehive on 2009/10/21 11:16:00

	IFC

Affected files ...

.. //depot/projects/docproj_hu/www/en/internal/Makefile#2 integrate
.. //depot/projects/docproj_hu/www/en/internal/i18n.sgml#1 branch
.. //depot/projects/docproj_hu/www/en/internal/policies.sgml#2 integrate
.. //depot/projects/docproj_hu/www/hu/administration.sgml#23 integrate
.. //depot/projects/docproj_hu/www/share/sgml/events.xml#20 integrate

Differences ...

==== //depot/projects/docproj_hu/www/en/internal/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/internal/Makefile,v 1.47 2007/02/18 12:40:45 simon Exp $
+# $FreeBSD: www/en/internal/Makefile,v 1.48 2009/10/19 07:26:46 murray Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -22,6 +22,7 @@
 DOCS+=	doceng.sgml
 DOCS+=	policies.sgml
 DOCS+=	fortunes.sgml
+DOCS+=	i18n.sgml
 
 INDEXLINK=	internal.html
 

==== //depot/projects/docproj_hu/www/en/internal/policies.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/internal/policies.sgml,v 1.8 2006/08/19 21:20:36 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/policies.sgml,v 1.9 2009/10/19 07:26:46 murray Exp $">
 <!ENTITY title "Policies for FreeBSD Committers">
 <!ENTITY % navinclude.docs "INCLUDE">
 ]>
@@ -38,6 +38,7 @@
 <a href="core-vote.html">Core's Voting Procedures</a>,
 the
 <a href="fortunes.html">Fortune File Policy</a>,
+<a href="i18n.html">Internationalization Policy</a>,
 and the
 <a href="../doc/en_US.ISO8859-1/articles/pr-guidelines/">Problem Report Handling Guidelines</a>.</p>
 

==== //depot/projects/docproj_hu/www/hu/administration.sgml#23 (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.16 2009/10/07 21:19:39 pgj Exp $">
+<!ENTITY date "$FreeBSD: www/hu/administration.sgml,v 1.17 2009/10/19 09:46:11 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#20 (text+ko) ====

@@ -10,10 +10,132 @@
 <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.75 2009/08/20 19:57:47 kib Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.76 2009/10/20 08:50:12 brueffer Exp $
     </cvs:keyword>
   </cvs:keywords>
 
+  <event id="bsdcan-2013">
+    <name>BSDCan 2013</name>
+    <url>http://www.bsdcan.org/</url>
+    <startdate>
+      <year>2013</year>
+      <month>5</month>
+      <day>13</day>
+    </startdate>
+    <enddate>
+      <year>2013</year>
+      <month>5</month>
+      <day>17</day>
+    </enddate>
+    <location>
+      <country code="CA">Canada</country>
+      <city>Ottawa</city>
+      <site>University of Ottawa</site>
+    </location>
+    <description>BSDCan is a developers conference with a strong focus
+      on emerging technologies, research projects, and works in
+      progress. It also features Userland infrastructure projects and
+      invites contributions from both free software developers and those
+      from commercial vendors.</description>
+  </event>
+
+  <event id="bsdcan-2012">
+    <name>BSDCan 2012</name>
+    <url>http://www.bsdcan.org/</url>
+    <startdate>
+      <year>2012</year>
+      <month>5</month>
+      <day>15</day>
+    </startdate>
+    <enddate>
+      <year>2012</year>
+      <month>5</month>
+      <day>18</day>
+    </enddate>
+    <location>
+      <country code="CA">Canada</country>
+      <city>Ottawa</city>
+      <site>University of Ottawa</site>
+    </location>
+    <description>BSDCan is a developers conference with a strong focus
+      on emerging technologies, research projects, and works in
+      progress. It also features Userland infrastructure projects and
+      invites contributions from both free software developers and those
+      from commercial vendors.</description>
+  </event>
+
+  <event id="bsdcan-2011">
+    <name>BSDCan 2011</name>
+    <url>http://www.bsdcan.org/</url>
+    <startdate>
+      <year>2011</year>
+      <month>5</month>
+      <day>10</day>
+    </startdate>
+    <enddate>
+      <year>2011</year>
+      <month>5</month>
+      <day>13</day>
+    </enddate>
+    <location>
+      <country code="CA">Canada</country>
+      <city>Ottawa</city>
+      <site>University of Ottawa</site>
+    </location>
+    <description>BSDCan is a developers conference with a strong focus
+      on emerging technologies, research projects, and works in
+      progress. It also features Userland infrastructure projects and
+      invites contributions from both free software developers and those
+      from commercial vendors.</description>
+  </event>
+
+  <event id="eurobsdcon-2010">
+    <name>EuroBSDCon 2010</name>
+    <url>http://2010.eurobsdcon.org/</url>
+    <startdate>
+      <year>2010</year>
+      <month>10</month>
+      <day>8</day>
+    </startdate>
+    <enddate>
+      <year>2010</year>
+      <month>10</month>
+      <day>10</day>
+    </enddate>
+    <location>
+      <country code="DE">Germany</country>
+      <city>Karlsruhe</city>
+    </location>
+    <description>The ninth annual European BSD Conference will take place
+      in Karlsruhe, Germany in October, 2010, and include a technical
+      track, tutorials, and FreeBSD developer summit.</description>
+  </event>
+
+  <event id="bsdcan-2010">
+    <name>BSDCan 2010</name>
+    <url>http://www.bsdcan.org/</url>
+    <startdate>
+      <year>2010</year>
+      <month>5</month>
+      <day>11</day>
+    </startdate>
+    <enddate>
+      <year>2010</year>
+      <month>5</month>
+      <day>14</day>
+    </enddate>
+    <location>
+      <country code="CA">Canada</country>
+      <city>Ottawa</city>
+      <site>University of Ottawa</site>
+    </location>
+    <description>BSDCan is a developers conference with a strong focus
+      on emerging technologies, research projects, and works in
+      progress. It also features Userland infrastructure projects and
+      invites contributions from both free software developers and those
+      from commercial vendors.</description>
+  </event>
+
   <event id="open-rheinruhr-2009">
     <name>OpenRheinRuhr 2009</name>
     <url>http://www.openrheinruhr.de/</url>
@@ -151,7 +273,7 @@
       <site>University of Cambridge</site>
     </location>
 
-    <description>The ninth annual European BSD Conference will take place
+    <description>The eighth annual European BSD Conference will take place
       in Cambridge, England in September, 2009, and include a technical
       track, tutorials, and FreeBSD developer summit.</description>
   </event>

More information about the p4-projects mailing list