From owner-p4-projects@FreeBSD.ORG  Sun Jan  1 10:39:08 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 911571065672; Sun,  1 Jan 2012 10:39:08 +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 535DD1065670
	for <perforce@FreeBSD.org>; Sun,  1 Jan 2012 10:39:08 +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 3F8838FC0C
	for <perforce@FreeBSD.org>; Sun,  1 Jan 2012 10:39:08 +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 q01Ad8Nk056977
	for <perforce@FreeBSD.org>; Sun, 1 Jan 2012 10:39:08 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q01Ad83q056974
	for perforce@freebsd.org; Sun, 1 Jan 2012 10:39:08 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sun, 1 Jan 2012 10:39:08 GMT
Message-Id: <201201011039.q01Ad83q056974@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 203804 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: Sun, 01 Jan 2012 10:39:08 -0000

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

Change 203804 by rene@rene_acer on 2012/01/01 10:38:40

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#118 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#30 integrate
.. //depot/projects/docproj_nl/www/en/copyright/freebsd-doc-license.sgml#5 integrate
.. //depot/projects/docproj_nl/www/en/copyright/freebsd-license.sgml#5 integrate
.. //depot/projects/docproj_nl/www/en/events/Makefile#5 integrate
.. //depot/projects/docproj_nl/www/en/internal/machines.sgml#8 integrate
.. //depot/projects/docproj_nl/www/en/smp/index.sgml#5 integrate
.. //depot/projects/docproj_nl/www/share/sgml/header.ent#10 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1045 2011/12/26 20:05:28 pawel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1047 2011/12/28 07:20:11 bf Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -993,6 +993,11 @@
     </listitem>
 
     <listitem>
+      <para>Anton Shterenlikht
+	<email>mexas@bris.ac.uk</email></para>
+    </listitem>
+
+    <listitem>
       <para>Anton Voronin
 	<email>anton@urc.ac.ru</email></para>
     </listitem>
@@ -7622,6 +7627,11 @@
     </listitem>
 
     <listitem>
+      <para>Oleg Ginzburg
+	<email>olevole@olevole.ru</email></para>
+    </listitem>
+
+    <listitem>
       <para>Oleg Kiselyov
 	<email>oleg@pobox.com</email></para>
     </listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.21 2011/06/13 14:35:59 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.22 2011/12/27 23:26:08 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/disks/chapter.sgml
      %SRCID%	1.310

==== //depot/projects/docproj_nl/www/en/copyright/freebsd-doc-license.sgml#5 (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/copyright/freebsd-doc-license.sgml,v 1.10 2011/01/22 11:52:09 wosch Exp $">
+<!ENTITY date "$FreeBSD: www/en/copyright/freebsd-doc-license.sgml,v 1.11 2011/12/31 11:22:10 bz Exp $">
 <!ENTITY title "The FreeBSD Documentation License">
 <!ENTITY % navinclude.about "INCLUDE">
 ]>
@@ -8,7 +8,7 @@
 <html>
 &header;
 
-  <p>Copyright 1994-2011
+  <p>Copyright 1994-2012
     The FreeBSD Project.
     All rights reserved.</p>
 

==== //depot/projects/docproj_nl/www/en/copyright/freebsd-license.sgml#5 (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/copyright/freebsd-license.sgml,v 1.23 2011/01/22 11:52:09 wosch Exp $">
+<!ENTITY date "$FreeBSD: www/en/copyright/freebsd-license.sgml,v 1.24 2011/12/31 11:22:10 bz Exp $">
 <!ENTITY title "The FreeBSD Copyright">
 <!ENTITY % navinclude.about "INCLUDE">
 ]>
@@ -8,7 +8,7 @@
 <html>
 &header;
 
-    <p>Copyright 1992-2011
+    <p>Copyright 1992-2012
       The FreeBSD Project.
       All rights reserved.</p>
 

==== //depot/projects/docproj_nl/www/en/events/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/events/Makefile,v 1.19 2011/01/22 14:49:45 ryusuke Exp $
+# $FreeBSD: www/en/events/Makefile,v 1.20 2011/12/31 11:22:10 bz Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -11,9 +11,9 @@
 SUBDIR+= 2003
 
 # The year the top level events.html file starts from:
-YEARSTART= 2010
+YEARSTART= 2011
 # Years to generate past events pages for and link from top level:
-PASTYEARS= 2009 2008 2007 2006 2005 2004 2003
+PASTYEARS= 2010 2009 2008 2007 2006 2005 2004 2003
 
 DATA=	events.css
 INDEXLINK=	events.html

==== //depot/projects/docproj_nl/www/en/internal/machines.sgml#8 (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/machines.sgml,v 1.97 2010/12/10 23:26:05 linimon Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/machines.sgml,v 1.99 2011/12/30 04:43:34 linimon Exp $">
 <!ENTITY title "The FreeBSD.org Network">
 <!ENTITY % navinclude.docs "INCLUDE">
 ]>
@@ -42,6 +42,13 @@
 </tr>
 
 <tr>
+<td>flame</td>
+<td>8.2-RELEASE</td>
+<td>sparc64</td>
+<td>General developer access.</td>
+</tr>
+
+<tr>
 <td>freefall</td>
 <td>8-STABLE</td>
 <td>i386</td>
@@ -221,7 +228,7 @@
 
 <tr>
 <td>gohan10-13</td>
-<td>9-CURRENT</td>
+<td>9-STABLE</td>
 <td>amd64 package build cluster.</td>
 </tr>
 
@@ -232,9 +239,9 @@
 </tr>
 
 <tr>
-<td>gohan40-59</td>
-<td>8-STABLE</td>
-<td>i386 package build cluster.</td>
+<td>gohan61-62</td>
+<td>9-STABLE</td>
+<td>amd64 package build cluster.</td>
 </tr>
 
 </tbody>
@@ -261,6 +268,13 @@
 </tr>
 
 <tr valign="top">
+<td>flame</td>
+<td>Sun SPARC</td>
+<td>2x UltraSparc-IIe 650MHz, 2GB Memory, sym SCSI controller,
+2x 36G SCSI-3 disk, 2x Sun ERI 10/100 Ethernet.</td>
+</tr>
+
+<tr valign="top">
 <td>freefall</td>
 <td>Intel x86</td>
 <td>2x dual-core 2.80GHz Xeon (Pentium-IV family), 2GB Memory,
@@ -290,10 +304,11 @@
 </tr>
 
 <tr valign="top">
-<td>gohan40-59</td>
+<td>gohan61-62</td>
 <td>Intel x86</td>
-<td>700-900MHz Pentium III, 1GB Memory, ServerWorks CSB5 UDMA100 controller,
-1x38GB ATA100 drive, Intel 82559 Pro 10/100B NIC.</td>
+<td>2x2.0GHz quad-core Intel Xeon L5335, 32GB Memory, Dell PERC 6 Megaraid
+SAS controller, 418GB local storage, 2x Broadcom NetXtreme II BCM5708
+1000Base-T Ethernet NIC.</td>
 </tr>
 
 <tr valign="top">

==== //depot/projects/docproj_nl/www/en/smp/index.sgml#5 (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/smp/index.sgml,v 1.179 2009/04/26 11:51:20 ed Exp $">
+<!ENTITY date "$FreeBSD: www/en/smp/index.sgml,v 1.180 2011/12/30 13:12:26 ryusuke Exp $">
 <!ENTITY title "FreeBSD SMPng Project">
 <!ENTITY email 'freebsd-smp'>
 <!ENTITY % navinclude.developers "INCLUDE">
@@ -31,7 +31,7 @@
       <li><a href="#plan">Project Plan (Historical)</a></li>
       <li><a href="#resources">Resources and Links</a></li>
       <li><a href="#subsystems">Subsystems and Staffing (Historical)</a></li>
-      <li><a href="#status">Tasks (Historical)</a></li>
+      <li><a href="#tasks">Tasks (Historical)</a></li>
       <li><a href="#issues">Known Issues (Historical)</a></li>
       <li><a href="#news">News (Historical)</a></li>
     </ul>
@@ -414,7 +414,7 @@
 
     </table>
 
-    <a name="status"></a>
+    <a name="tasks"></a>
     <h2>Tasks (Historical)</h2>
 
     <p>Following is an incomplete list of general tasks.</p>

==== //depot/projects/docproj_nl/www/share/sgml/header.ent#10 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/header.ent,v 1.17 2011/08/15 19:14:53 gjb Exp $ -->
+<!-- $FreeBSD: www/share/sgml/header.ent,v 1.18 2011/12/31 11:22:10 bz Exp $ -->
 
 <!-- FreeBSD HTML Header Entities -->
 <!-- PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header Entities//EN" -->
@@ -11,7 +11,7 @@
 <!-- Override in the prolog <em>before</em> including this  -->
 <!-- file if necessary.                                      -->
 <!ENTITY copyright '<a href="&base;/search/index-site.html">Site Map</a> |
-  <a href="&base;/copyright/">Legal Notices</a> | &copy; 1995-2011 The FreeBSD Project.
+  <a href="&base;/copyright/">Legal Notices</a> | &copy; 1995-2012 The FreeBSD Project.
   All rights reserved.'>
 <!ENTITY email 'freebsd-questions'>
 <!ENTITY author '<a href="&base;/index.html">home</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">contact</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">legal</a> &nbsp; | &nbsp; &copyright;'>