PERFORCE change 158584 for review
Gabor Pali
pgj at FreeBSD.org
Mon Mar 2 07:39:06 PST 2009
http://perforce.freebsd.org/chv.cgi?CH=158584
Change 158584 by pgj at beehive on 2009/03/02 15:38:54
IFC
Affected files ...
.. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#22 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/dchagin.key#1 branch
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#16 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#16 integrate
.. //depot/projects/docproj_hu/www/en/developers.sgml#18 integrate
.. //depot/projects/docproj_hu/www/en/donations/donors.sgml#14 integrate
.. //depot/projects/docproj_hu/www/en/ports/categories#2 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#10 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#9 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.software.xml#2 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#39 integrate
.. //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#5 integrate
Differences ...
==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#22 (text+ko) ====
@@ -13,7 +13,7 @@
builds for the other languages, and we will poke fun of you
in public.
- $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.471 2009/02/19 22:04:29 mva Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.472 2009/03/01 11:17:00 dchagin Exp $
-->
<!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -244,6 +244,8 @@
<!ENTITY a.dburr "Donald Burr <email>dburr at FreeBSD.org</email>">
+<!ENTITY a.dchagin "Dmitry Chagin <email>dchagin at FreeBSD.org</email>">
+
<!ENTITY a.dcs "Daniel C. Sobral <email>dcs at FreeBSD.org</email>">
<!ENTITY a.dd "Dima Dorfman <email>dd at FreeBSD.org</email>">
==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#16 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.88 2009/02/19 22:04:29 mva Exp $
+ $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.89 2009/03/01 11:17:00 dchagin Exp $
-->
<sect2 id="pgpkey-ariff">
@@ -1411,3 +1411,7 @@
&pgpkey.mva;
</sect2>
+ <sect2 id="pgpkey-dchagin">
+ <title>&a.dchagin;</title>
+ &pgpkey.dchagin;
+ </sect2>
==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#16 (text+ko) ====
@@ -1,5 +1,5 @@
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.184 2009/02/19 22:04:29 mva Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.185 2009/03/01 11:17:00 dchagin Exp $ -->
<!-- PGP keyblocks -->
<!ENTITY pgpkey.aaron SYSTEM "aaron.key">
<!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -66,6 +66,7 @@
<!ENTITY pgpkey.das SYSTEM "das.key">
<!ENTITY pgpkey.davidxu SYSTEM "davidxu.key">
<!ENTITY pgpkey.db SYSTEM "db.key">
+<!ENTITY pgpkey.dchagin SYSTEM "dchagin.key">
<!ENTITY pgpkey.dcs SYSTEM "dcs.key">
<!ENTITY pgpkey.dd SYSTEM "dd.key">
<!ENTITY pgpkey.delphij SYSTEM "delphij.key">
==== //depot/projects/docproj_hu/www/en/developers.sgml#18 (text+ko) ====
@@ -6,7 +6,7 @@
us to update author names, or the representation of those names (such
as adding email addresses), by just editing a single file.
-$FreeBSD: www/en/developers.sgml,v 1.213 2009/02/19 22:11:01 mva Exp $
+$FreeBSD: www/en/developers.sgml,v 1.214 2009/03/01 11:45:35 dchagin Exp $
-->
@@ -124,6 +124,7 @@
<!ENTITY a.db "Diane Bruce">
<!ENTITY a.dbaker "Daniel Baker">
<!ENTITY a.dburr "Donald Burr">
+<!ENTITY a.dchagin "Dmitry Chagin">
<!ENTITY a.dcs "Daniel C. Sobral">
<!ENTITY a.dd "Dima Dorfman">
<!ENTITY a.dds "Diomidis D. Spinellis">
==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#14 (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/donations/donors.sgml,v 1.387 2009/02/17 16:14:05 tabthorpe Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.388 2009/02/25 17:55:10 tabthorpe Exp $">
<!ENTITY title "Hardware Donors Page">
<!ENTITY % navinclude.about "INCLUDE">
<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
@@ -2553,6 +2553,18 @@
<td> marcel </td>
<td> Received </td>
</tr>
+
+ <tr>
+ <td> Charles Smeijer </td>
+ <td> HP/CPQ Gb NIC NC7770, PCI-X 133 HP p/n 284685-003 Rev 0G<br>
+ HP/CPQ Gb NIC NC7770, PCI-X 133 HP p/n 284685-003 Rev 0E<br>
+ HP/CPQ Dual port Gb NIC NC7170, PCI-X 133 HP p/n 313559-001 Rev 0A<br>
+ SMC Fast ethernet USB NIC p/n 98-012084-585<br>
+ IBM Gb NIC PCI-X 133 p/n 00P6130<br>
+ HP DAT72 data cartridge 72 GB </td>
+ <td> ed </td>
+ <td> Received </td>
+ </tr>
</table>
&footer;
==== //depot/projects/docproj_hu/www/en/ports/categories#2 (text+ko) ====
@@ -1,5 +1,5 @@
#Originally from src/release/sysinstall/index.c,v 1.57 1998/10/15
-#$FreeBSD: www/en/ports/categories,v 1.38 2008/04/23 02:09:56 linimon Exp $
+#$FreeBSD: www/en/ports/categories,v 1.39 2009/02/26 01:44:43 linimon Exp $
# See categories.descriptions for the meaning of the abbrevations at the
# end of each category.
@@ -20,6 +20,7 @@
deskutils,"Various Desktop utilities.",EU
devel,"Software development utilities and libraries.",SAAD
dns,"DNS client and server utilities.",CCATI
+docs,"Meta-ports for FreeBSD documentation.",VC
editors,"Common text editors.",EU
elisp,"Things related to Emacs Lisp.",VC
emulators,"Utilities for emulating other OS types.",SAAD
==== //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#10 (text+ko) ====
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
"http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.57 2008/11/14 21:12:47 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.58 2009/02/26 19:21:53 jkois Exp $ -->
<entries>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.57 2008/11/14 21:12:47 jkois Exp $
+ $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.58 2009/02/26 19:21:53 jkois Exp $
</cvs:keyword>
</cvs:keywords>
@@ -86,6 +86,20 @@
</description>
</entry>
+ <entry id="Acadix" category="namerica">
+ <name>Acadix, LLC</name>
+ <url>http://www.acadix.biz</url>
+ <description>
+ Acadix, LLC offers a full range of services for FreeBSD and other
+ platforms, including system integration, file servers, WEB servers,
+ and programming/porting. Acadix provides on-site services to
+ businesses, schools, and charitable organizations in the Milwaukee
+ metro area. Programming services are available to all locations in
+ the U.S. For more information, please <a
+ href="http://acadix.biz">visit our website</a>.
+ </description>
+ </entry>
+
<entry id="Advance" category="namerica">
<name>Advance Systems Group</name>
<url>http://www.advansys.net/</url>
==== //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#9 (text+ko) ====
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
"http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.40 2008/11/14 21:37:31 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.43 2009/02/26 21:01:20 jkois Exp $ -->
<entries>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.40 2008/11/14 21:37:31 jkois Exp $
+ $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.43 2009/02/26 21:01:20 jkois Exp $
</cvs:keyword>
</cvs:keywords>
@@ -890,14 +890,49 @@
<url>http://www.rootbsd.net</url>
<description>
RootBSD is a hosting company specializing in virtual FreeBSD
- servers. The FreeBSD Virtual Private Servers were created with
- FreeBSD jails, and some custom development we have done on top
- of that. Each VPS includes root access and a web-based control
- panel for managing and monitoring the virtual FreeBSD environment.
- Technical support is handled in-house by FreeBSD experts who can
- diagnose problems and help you get up and running quickly. RootBSD
- has donated multiple jails to FreeBSD developers to support the
- community.
+ hosting and managed services. The FreeBSD Virtual Private
+ Servers allow users to modify the kernel, setup a firewall and
+ many more options. Each VPS includes root access and a web-based
+ control panel for managing the virtual environment. Technical
+ support is handled in-house by FreeBSD experts who can diagnose
+ problems and help you get up and running quickly. RootBSD has
+ donated services to FreeBSD developers to support the community.
+ </description>
+ </entry>
+
+ <entry id="ServerBeach">
+ <name>ServerBeach</name>
+ <url>http://www.serverbeach.com</url>
+ <description>
+ Founded in 2002, ServerBeach was launched to serve the market's
+ thirst for self-managed servers equipped with powerful hardware,
+ fast and reliable bandwidth, convenient automation tools, and
+ first-class support - all at an affordable price. Self-managed
+ servers are not an afterthought at the Beach, it's our business.
+ And we do whatever we can to satisfy the needs of our core
+ customers, the "Geeks" - people like you. People like us. In 2004,
+ the picture improved even more when ServerBeach was acquired by
+ PEER 1. This allowed us to connect our data centers to the
+ rock-solid, ultra-fast PEER 1 network with our 100% Uptime
+ Guarantee. ServerBeach is the only self-managed hosting company
+ in the world that offers servers in three geographically diverse
+ locations: WEST COAST, CENTRAL US, and EAST COAST. Now offering
+ FreeBSD, Ubuntu, and other Linux Operating Systems.
+ </description>
+ </entry>
+
+ <entry id="SimpleRezo">
+ <name>SimpleRezo</name>
+ <url>http://www.simplerezo.com</url>
+ <description>
+ SimpleRezo, a French company, provides web hosting solutions based
+ exclusively on FreeBSD and technologies (jails or dedicated
+ server, Apache, PHP, Tomcat, MySQL, pgSQL...). Other services
+ include: Network architecture consulting (fail-over, high
+ availability), FreeBSD server administration or support (fileserver,
+ firewalls, mailserver) and others more. Please visit our <a
+ href="http://www.simplerezo.com/nous-contacter.php">website</a>
+ to get more information.
</description>
</entry>
==== //depot/projects/docproj_hu/www/share/sgml/commercial.software.xml#2 (text+ko) ====
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
"http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.software.xml,v 1.10 2007/09/01 21:29:59 gabor Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.software.xml,v 1.11 2009/02/26 20:48:10 jkois Exp $ -->
<entries>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/commercial.software.xml,v 1.10 2007/09/01 21:29:59 gabor Exp $
+ $FreeBSD: www/share/sgml/commercial.software.xml,v 1.11 2009/02/26 20:48:10 jkois Exp $
</cvs:keyword>
</cvs:keywords>
@@ -1052,6 +1052,20 @@
</description>
</entry>
+ <entry id="PacificTimesheet" category="ECOMMERCE">
+ <name>Pacific Timesheet</name>
+ <url>http://www.pacifictimesheet.com/</url>
+ <description>
+ Pacific Timesheet is a web-based timesheet software that provides
+ payroll, project, job costing, time and attendance features in one
+ system. Other modules include automated approvals, billing and
+ pay rates, time-off scheduling, custom reporting, iPhone timesheet,
+ IVR integration, time clock integration and payroll integration.
+ We support all major operating systems and browsers. Our software
+ is available as a licensed or as a ASP/online version.
+ </description>
+ </entry>
+
<entry id="PACT" category="SYSADMIN">
<name>PACT</name>
<url>http://pact.insider.org/</url>
==== //depot/projects/docproj_hu/www/share/sgml/news.xml#39 (text+ko) ====
@@ -25,7 +25,7 @@
<news>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/news.xml,v 1.228 2009/02/19 22:15:41 miwi Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.229 2009/03/01 11:45:35 dchagin Exp $
</cvs:keyword>
</cvs:keywords>
@@ -33,6 +33,20 @@
<name>2009</name>
<month>
+ <name>3</name>
+
+ <day>
+ <name>1</name>
+
+ <event>
+ <p>New committer: <a href="mailto:dchagin at FreeBSD.org">Dmitry
+ Chagin</a> (src)</p>
+ </event>
+ </day>
+
+ </month>
+
+ <month>
<name>2</name>
<day>
==== //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#5 (text+ko) ====
@@ -5,7 +5,7 @@
<usergroups>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/usergroups.xml,v 1.75 2008/12/27 04:29:01 murray Exp $
+ $FreeBSD: www/share/sgml/usergroups.xml,v 1.76 2009/02/27 17:07:01 jkois Exp $
</cvs:keyword>
</cvs:keywords>
@@ -325,18 +325,6 @@
</country>
<country code="RU" name="Russia">
- <entry id="e-bug">
- <name>BSD User Group Ekaterinburg (E#BUG)</name>
- <url>http://bsdekaterinburg.ru/</url>
-
- <description>The BSD User Group Ekaterinburg (E#BUG) is a
- community of BSD users in Ekaterinburg, Russia. We distribute
- BSD releases to all who asks us for it in our city, and we are
- trying to help everyone to discover and use BSD. Please visit
- our web site and learn more about us.
- </description>
- </entry>
-
<entry id="unixforums-ru">
<name>Russian UNIX Forums</name>
<url>http://unixforums.org.ru</url>
More information about the p4-projects
mailing list