From owner-p4-projects@FreeBSD.ORG  Thu Jul 28 20:55:39 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 60C5C106572B; Thu, 28 Jul 2011 20:55:39 +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 E0626106570C
	for <perforce@FreeBSD.org>; Thu, 28 Jul 2011 20:55:38 +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 CD0A68FC0A
	for <perforce@FreeBSD.org>; Thu, 28 Jul 2011 20:55:38 +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 p6SKtcMG096845
	for <perforce@FreeBSD.org>; Thu, 28 Jul 2011 20:55:38 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6SKtcQP096842
	for perforce@freebsd.org; Thu, 28 Jul 2011 20:55:38 GMT
	(envelope-from rene@FreeBSD.org)
Date: Thu, 28 Jul 2011 20:55:38 GMT
Message-Id: <201107282055.p6SKtcQP096842@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 196839 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: Thu, 28 Jul 2011 20:55:39 -0000

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

Change 196839 by rene@rene_acer on 2011/07/28 20:55:01

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#98 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#8 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#21 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#29 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#17 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#40 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#47 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#30 integrate
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Makefile#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Makefile.inc#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/Makefile#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/Makefile#3 integrate
.. //depot/projects/docproj_nl/www/en/cgi/Makefile.inc#1 branch
.. //depot/projects/docproj_nl/www/share/mk/web.site.mk#4 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#98 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1007 2011/07/15 21:07:31 zi Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1008 2011/07/27 15:18:15 crees Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -6495,6 +6495,10 @@
     </listitem>
 
     <listitem>
+      <para>Maxim Ignatenko
+	<email>gelraen.ua@gmail.com</email></para>
+
+    <listitem>
       <para>Maxim Loginov
         <email>zeliboba@mail.ru</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#8 (text+ko) ====

@@ -37,7 +37,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.86 2011/01/15 12:51:40 jkois Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.87 2011/07/24 21:27:50 gjb Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -560,11 +560,9 @@
     fast machine and access to a source repository. (That should be
     everyone, since we offer anonymous CVS! See The Handbook for
     details.)  The <emphasis>only</emphasis> special requirement is
-    that the &man.vn.4; device must be available. (On -CURRENT, this
-    device has been replaced by the new &man.md.4;
-    memory disk driver.)  If the
+    that the &man.md.4; device must be available. If the
     device is not loaded into your kernel, then the kernel module
-    should be automatically loaded when &man.vnconfig.8; is executed
+    should be automatically loaded when &man.mdconfig.8; is executed
     during the boot media creation phase.  All of the tools necessary
     to build a release are available from the CVS repository in
     <filename>src/release</filename>.  These tools aim to provide a

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

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.105 2011/03/28 08:48:54 bcr Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.106 2011/07/28 15:15:51 blackend Exp $
 -->
 
 <chapter id="desktop">
@@ -181,7 +181,7 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
 
-      <para>This will install <application>Firefox</application> 4.0,
+      <para>This will install <application>Firefox</application> 5.0,
         if you want to run <application>Firefox</application> 3.6,
         use instead:</para>
 
@@ -280,19 +280,26 @@
 	</step>
 
 	<step>
-	  <title>For Firefox 3.6 and 4.0</title>
+	  <title>For Firefox 3.6 and 5.0</title>
 
       <para>Install <application>OpenJDK 6</application>
         through the Ports Collection by typing:</para>
         
       <screen>&prompt.root; <userinput>cd /usr/ports/java/openjdk6</userinput>
-&prompt.root; <userinput>make config install clean</userinput></screen>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <para>Then install the <filename
+	role="package">java/icedtea-web</filename> port:</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/java/icedtea-web</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>Make sure you have selected the WEB option.</para>
+      <para>Make sure you have kept the default configuration options
+	for both ports.</para>
 
       <para>Each user will have to run the following command:</para>
 
-      <screen>&prompt.user; <userinput>ln -s /usr/local/openjdk6/jre/lib/IcedTeaPlugin.so \
+      <screen>&prompt.user; <userinput>ln -s /usr/local/lib/IcedTeaPlugin.so \
   $HOME/.mozilla/plugins/</userinput></screen>
 
       <para>Start your browser, enter <literal>about:plugins</literal>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.135 2011/07/23 21:30:36 gjb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.136 2011/07/24 10:08:00 rene Exp $
 -->
 
 <chapter id="network-servers">
@@ -4125,7 +4125,7 @@
 	  sign the zone <hostid role="domainname">example.com</hostid>, located
 	  in <filename>example.com.db</filename> would look similar to</para>
 
-	<screen>&prompt.user; <userinput>dnssec-signzone -o example.com -k Kexample.com+005+nnnnn.KSK example.com.db Kexample.com+005+nnnnn.ZSK.key</userinput></screen>
+	<screen>&prompt.user; <userinput>dnssec-signzone -o example.com -k Kexample.com.+005+nnnnn.KSK example.com.db Kexample.com.+005+nnnnn.ZSK.key</userinput></screen>
 
 	<para>The key supplied to the <option>-k</option> argument is the
 	  <acronym>KSK</acronym> and the other key file is the

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#17 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.7 2011/03/20 10:57:10 rene Exp $
+# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.8 2011/07/24 10:49:09 rene Exp $
 
 # %SOURCE%	en_US.ISO8859-1/articles/Makefile
 # %SRCID%	1.63

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.29 2011/07/11 19:17:34 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.30 2011/07/24 10:49:09 rene Exp $
      Vertaald door: Siebrand Mazeland
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/eresources/chapter.sgml

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.32 2011/05/28 09:38:36 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.33 2011/07/24 10:49:09 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
      %SRCID%	1.136

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#30 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
     Namen van FreeBSD mailinglijsten en gerelateerde software.
 
-    $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.25 2011/07/11 19:17:35 rene Exp $
+    $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.26 2011/07/24 10:49:09 rene Exp $
     Vertaald door: Siebrand Mazeland
 
     %SOURCE%	en_US.ISO8859-1/share/sgml/mailing-lists.ent

==== //depot/projects/docproj_nl/www/en/cgi/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/cgi/Makefile,v 1.35 2011/07/20 23:52:12 shaun Exp $
+# $FreeBSD: www/en/cgi/Makefile,v 1.36 2011/07/25 07:35:42 hrs Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -16,18 +16,6 @@
 DATA+=	cvsweb.conf-freebsd
 DATA+=	query-pr-lib.pl
 
-CGI_SUBDIRS=	GnatsPR GnatsPR/Section
-
-CGI_SUBFILES+=	GnatsPR/MIMEIterator.pm
-CGI_SUBFILES+=	GnatsPR/Section.pm
-CGI_SUBFILES+=	GnatsPR/Section/Email.pm
-CGI_SUBFILES+=	GnatsPR/Section/FieldStart.pm
-CGI_SUBFILES+=	GnatsPR/Section/MIME.pm
-CGI_SUBFILES+=	GnatsPR/Section/Patch.pm
-CGI_SUBFILES+=	GnatsPR/Section/StateChange.pm
-CGI_SUBFILES+=	GnatsPR/Section/Text.pm
-CGI_SUBFILES+=	GnatsPR/SectionIterator.pm
-
 CGI=
 CGI+=	confirm-code.cgi
 CGI+=	cvsweb.cgi
@@ -46,6 +34,8 @@
 CGI+=	search.cgi
 CGI+=	url.cgi
 
+SUBDIR=	GnatsPR
+
 .SUFFIXES:	.C .cgi
 
 .C.cgi:

==== //depot/projects/docproj_nl/www/share/mk/web.site.mk#4 (text+ko) ====

@@ -1,5 +1,5 @@
 # bsd.web.mk
-# $FreeBSD: www/share/mk/web.site.mk,v 1.79 2011/07/21 00:42:50 shaun Exp $
+# $FreeBSD: www/share/mk/web.site.mk,v 1.80 2011/07/25 07:35:42 hrs Exp $
 
 #
 # Build and install a web site.
@@ -358,14 +358,6 @@
 .endif
 .if defined(CGI) && !empty(CGI)
 	@${MKDIR} -p ${CGIINSTALLDIR}
-.if defined(CGI_SUBDIRS) && !empty(CGI_SUBDIRS)
-.for sd in ${CGI_SUBDIRS}
-	@${MKDIR} -p ${CGIINSTALLDIR}/${sd}
-.endfor
-.for sf in ${CGI_SUBFILES}
-	${INSTALL_CGI} ${.CURDIR}/${sf} ${CGIINSTALLDIR}/${sf}
-.endfor
-.endif
 .for entry in ${CGI}
 	${INSTALL_CGI} ${.CURDIR}/${entry} ${CGIINSTALLDIR}
 .endfor