Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Jan 2010 10:15:21 GMT
From:      Gabor Pali <pgj@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 172650 for review
Message-ID:  <201001061015.o06AFLPV046882@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=172650

Change 172650 by pgj@Binturong on 2010/01/06 10:15:17

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#56 integrate
.. //depot/projects/docproj_hu/www/en/internal/machines.sgml#5 integrate
.. //depot/projects/docproj_hu/www/share/sgml/header.ent#6 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#56 (text+ko) ====

@@ -20,7 +20,7 @@
 
     <corpauthor>A &os; Dokument&aacute;ci&oacute;s Projekt</corpauthor>
 
-    <pubdate>$FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.16 2009/12/15 22:32:53 pgj Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.17 2010/01/03 00:20:07 pgj Exp $</pubdate>
 
     <copyright>
       <year>1995</year>

==== //depot/projects/docproj_hu/www/en/internal/machines.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/internal/machines.sgml,v 1.94 2009/11/09 05:49:27 linimon Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/machines.sgml,v 1.95 2010/01/03 19:18:01 linimon Exp $">
 <!ENTITY title "The FreeBSD.org Network">
 <!ENTITY % navinclude.docs "INCLUDE">
 ]>
@@ -40,14 +40,14 @@
 
 <tr>
 <td>freefall</td>
-<td>7-CURRENT</td>
+<td>8-PRERELEASE</td>
 <td>GNATS/shell Logins.</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>ftp-master</td>
-<td>7-STABLE</td>
+<td>8-STABLE</td>
 <td>FTP Master (stage server).</td>
 <td>peter/kuriyama/obrien/steve</td>
 </tr>
@@ -60,15 +60,22 @@
 </tr>
 
 <tr>
+<td>gohan18</td>
+<td>8-STABLE</td>
+<td>portmgr testbed.</td>
+<td>portmgr</td>
+</tr>
+
+<tr>
 <td>gohan20-59</td>
-<td>8-CURRENT</td>
+<td>8-STABLE</td>
 <td>i386 package build cluster.</td>
 <td>portmgr</td>
 </tr>
 
 <tr>
 <td>hub</td>
-<td>6-STABLE</td>
+<td>7-STABLE</td>
 <td>Mailing Lists and Mail services.</td>
 <td>postmaster</td>
 </tr>
@@ -103,23 +110,23 @@
 
 <tr>
 <td>pluto1</td>
-<td>7-STABLE</td>
-<td>Reference machine for testing ia64 changes.</td>
+<td>8-STABLE</td>
+<td>Reference machine for testing ia64 changes; ia64 package building.</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>pluto2</td>
-<td>-CURRENT</td>
-<td>Reference machine for testing ia64 changes.</td>
+<td>9-CURRENT</td>
+<td>Reference machine for testing ia64 changes; ia64 package building.</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>pointyhat</td>
-<td>-CURRENT</td>
+<td>9-CURRENT</td>
 <td>All architectures package build master.</td>
-<td>portmgr</td>
+<td>portmgr (r/w), committers (r/o)</td>
 </tr>
 
 <tr>
@@ -138,7 +145,7 @@
 
 <tr>
 <td>sledge</td>
-<td>-CURRENT</td>
+<td>8-STABLE</td>
 <td>Reference machine for testing AMD64 changes.</td>
 <td>committers</td>
 </tr>
@@ -152,7 +159,7 @@
 
 <tr>
 <td>www</td>
-<td>6-STABLE</td>
+<td>7-STABLE</td>
 <td>The www.FreeBSD.org Webserver.</td>
 <td>webmaster</td>
 </tr>
@@ -192,8 +199,8 @@
 <tr valign="top">
 <td>ftp-master</td>
 <td>Intel x86</td>
-<td>2.66GHz Pentium 4, 1GB Memory, 40GB Maxtor ATA drive,
-  Broadcom BCM5703 Gigabit Ethernet NIC.</td>
+<td>2x dual-core 2.80GHz Xeon, 4GB Memory, LSI Logic PERC 4e/Di RAID
+  adapter, 1.14T disk, 2x Intel PRO/1000 Ethernet NIC.</td>
 </tr>
 
 <tr valign="top">
@@ -204,6 +211,13 @@
 </tr>
 
 <tr valign="top">
+<td>gohan18</td>
+<td>Intel x86</td>
+<td>2x1.8GHz quad-core Xeon L5320, 8GB Memory, LSILogic SAS/SATA controller,
+1x160GB SAT300 drive, 2x Broadcom NetXtreme Gigabit Ethernet NIC.</td>
+</tr>
+
+<tr valign="top">
 <td>gohan20-59</td>
 <td>Intel x86</td>
 <td>700-900MHz Pentium III, 1GB Memory, ServerWorks CSB5 UDMA100 controller,
@@ -283,9 +297,9 @@
 
 <tr valign="top">
 <td>www</td>
-<td>Intel x86 MP</td>
-<td>2x600MHz Pentium III, 1GB Memory, 3ware 4-port IDE controller (twe),
-  Intel EtherExpress Pro 10/100B NIC.</td>
+<td>Intel x86</td>
+<td>2x dual-core 2.80GHz Xeon, 1.5GB Memory, Compaq Smart Array 5i RAID controller,
+  2x34GB SCSI Disks in RAID1, 2x Broadcom Gigabit Ethernet NIC.</td>
 </tr>
 
 </tbody>

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/header.ent,v 1.13 2009/07/28 21:36:17 danger Exp $ -->
+<!-- $FreeBSD: www/share/sgml/header.ent,v 1.14 2010/01/05 02:34:57 bland 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-2009 The FreeBSD Project.
+  <a href="&base;/copyright/">Legal Notices</a> | &copy; 1995-2010 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;'>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001061015.o06AFLPV046882>