From owner-p4-projects@FreeBSD.ORG  Fri Aug 12 15:40:05 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9FA1B1065673; Fri, 12 Aug 2011 15:40:05 +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 61AEA106564A
	for <perforce@FreeBSD.org>; Fri, 12 Aug 2011 15:40:05 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 479FB8FC12
	for <perforce@FreeBSD.org>; Fri, 12 Aug 2011 15:40:05 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p7CFe5lv050265
	for <perforce@FreeBSD.org>; Fri, 12 Aug 2011 15:40:05 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p7CFe5fv050260
	for perforce@freebsd.org; Fri, 12 Aug 2011 15:40:05 GMT
	(envelope-from rene@FreeBSD.org)
Date: Fri, 12 Aug 2011 15:40:05 GMT
Message-Id: <201108121540.p7CFe5fv050260@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.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 197555 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: Fri, 12 Aug 2011 15:40:05 -0000

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

Change 197555 by rene@rene_acer on 2011/08/12 15:39:54

	IFC

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml#12 integrate
.. //depot/projects/docproj_nl/share/mk/doc.xml.mk#3 integrate
.. //depot/projects/docproj_nl/www/share/mk/doc.xml.mk#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events2011.xml#3 integrate

Differences ...

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v 1.10 2011/02/02 11:09:08 remko Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v 1.11 2011/08/08 20:57:53 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml
      %SRCID%	1.136

==== //depot/projects/docproj_nl/share/mk/doc.xml.mk#3 (text+ko) ====

@@ -1,5 +1,5 @@
 # doc.xml.mk
-# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.14 2008/06/22 23:14:33 murray Exp $
+# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.15 2011/08/09 06:32:50 hrs Exp $
 
 XML_CATALOG_FILES=	file://${.OBJDIR}/catalog-cwd.xml \
 			file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \
@@ -174,17 +174,29 @@
 
 # DEPENDSET: events  ..........................................................
 _DEPENDSET.events=	${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_EVENTS} \
+			${XML_EVENTS_EVENTS_MASTER_SUBFILES} \
+			${XML_EVENTS_EVENTS_SUBFILES} \
 			${XSL_EVENTS} \
 			${XSL_EVENTS_ICS} \
 			${XML_INCLUDES}
 _PARAMS.events=		--param events.xml-master "'${XML_EVENTS_EVENTS_MASTER}'" \
 			--param events.xml "'${XML_EVENTS_EVENTS}'"
 XML_EVENTS_EVENTS_MASTER=${WEB_PREFIX}/share/sgml/events.xml
+XML_EVENTS_EVENTS_MASTER_SUBFILES=
+.for Y in 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013
+XML_EVENTS_EVENTS_MASTER_SUBFILES+=	${WEB_PREFIX}/share/sgml/events${Y}.xml
+.endfor
 .if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events.xml)
 XML_EVENTS_EVENTS=	${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events.xml
 .else
 XML_EVENTS_EVENTS=	${XML_EVENTS_EVENTS_MASTER}
 .endif
+XML_EVENTS_EVENTS_SUBFILES=
+.for Y in 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013
+.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events${Y}.xml)
+XML_EVENTS_EVENTS_SUBFILES+=	${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events${Y}.xml
+.endif
+.endfor
 XSL_EVENTS=		${WEB_PREFIX}/share/sgml/templates.events.xsl
 XSL_EVENTS_ICS=		${WEB_PREFIX}/share/sgml/templates.events2ics.xsl
 XSL_EVENTS_PAST=	${WEB_PREFIX}/share/sgml/templates.pastevents.xsl

==== //depot/projects/docproj_nl/www/share/mk/doc.xml.mk#2 (text+ko) ====

@@ -1,5 +1,5 @@
 # doc.xml.mk
-# $FreeBSD: www/share/mk/doc.xml.mk,v 1.14 2008/06/22 23:14:33 murray Exp $
+# $FreeBSD: www/share/mk/doc.xml.mk,v 1.15 2011/08/09 06:32:50 hrs Exp $
 
 XML_CATALOG_FILES=	file://${.OBJDIR}/catalog-cwd.xml \
 			file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \
@@ -176,17 +176,29 @@
 
 # DEPENDSET: events  ..........................................................
 _DEPENDSET.events=	${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_EVENTS} \
+			${XML_EVENTS_EVENTS_MASTER_SUBFILES} \
+			${XML_EVENTS_EVENTS_SUBFILES} \
 			${XSL_EVENTS} \
 			${XSL_EVENTS_ICS} \
 			${XML_INCLUDES}
 _PARAMS.events=		--param events.xml-master "'${XML_EVENTS_EVENTS_MASTER}'" \
 			--param events.xml "'${XML_EVENTS_EVENTS}'"
 XML_EVENTS_EVENTS_MASTER=${WEB_PREFIX}/share/sgml/events.xml
+XML_EVENTS_EVENTS_MASTER_SUBFILES=
+.for Y in 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013
+XML_EVENTS_EVENTS_MASTER_SUBFILES+=	${WEB_PREFIX}/share/sgml/events${Y}.xml
+.endfor
 .if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events.xml)
 XML_EVENTS_EVENTS=	${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events.xml
 .else
 XML_EVENTS_EVENTS=	${XML_EVENTS_EVENTS_MASTER}
 .endif
+XML_EVENTS_EVENTS_SUBFILES=
+.for Y in 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013
+.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events${Y}.xml)
+XML_EVENTS_EVENTS_SUBFILES+=	${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events${Y}.xml
+.endif
+.endfor
 XSL_EVENTS=		${WEB_PREFIX}/share/sgml/templates.events.xsl
 XSL_EVENTS_ICS=		${WEB_PREFIX}/share/sgml/templates.events2ics.xsl
 XSL_EVENTS_PAST=	${WEB_PREFIX}/share/sgml/templates.pastevents.xsl

==== //depot/projects/docproj_nl/www/share/sgml/events2011.xml#3 (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/events2011.xml,v 1.2 2011/08/08 12:23:38 jkois Exp $
+      $FreeBSD: www/share/sgml/events2011.xml,v 1.3 2011/08/12 12:16:21 kib Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -70,6 +70,27 @@
       use.</description>
   </event>
 
+  <event id="kyivbsd-2011">
+    <name>KyivBSD 2011</name>
+    <url>http://ru.kyivbsd.org.ua/</url>
+    <startdate>
+      <year>2011</year>
+      <month>9</month>
+      <day>24</day>
+    </startdate>
+    <enddate>
+      <year>2011</year>
+      <month>9</month>
+      <day>24</day>
+    </enddate>
+    <location>
+      <country code="UA">Ukraine</country>
+      <city>Kiev</city>
+    </location>
+    <description>The third KyivBSD conference will take place in Kiev,
+      Ukraine.</description>
+  </event>
+
   <event id="worldipv6day-2011">
     <name>World IPv6 Day</name>
     <url>http://www.worldipv6day.org/</url>