PERFORCE change 173485 for review

Gabor Pali pgj at FreeBSD.org
Thu Jan 21 22:55:54 UTC 2010


http://p4web.freebsd.org/chv.cgi?CH=173485

Change 173485 by pgj at Binturong on 2010/01/21 22:55:50

	IFC

Affected files ...

.. //depot/projects/docproj_hu/www/en/platforms/i386.sgml#2 integrate
.. //depot/projects/docproj_hu/www/en/where.sgml#6 integrate
.. //depot/projects/docproj_hu/www/hu/events/Makefile#5 integrate
.. //depot/projects/docproj_hu/www/share/sgml/events.xml#24 integrate
.. //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#11 integrate

Differences ...

==== //depot/projects/docproj_hu/www/en/platforms/i386.sgml#2 (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/platforms/i386.sgml,v 1.11 2008/03/04 17:57:45 jkois Exp $">
+<!ENTITY date "$FreeBSD: www/en/platforms/i386.sgml,v 1.12 2010/01/21 21:11:07 jkois Exp $">
 <!ENTITY title "FreeBSD/i386 Project">
 <!ENTITY % navinclude.developers "INCLUDE">
 ]>
@@ -21,7 +21,6 @@
 
   <ul>
     <li><a href="#news">Latest News</a></li>
-    <li><a href="#hw">Hardware List</a></li>
     <li><a href="#links">Points of Interest</a></li>
   </ul>
 
@@ -36,12 +35,6 @@
       </p></li>
   </ul>
 
-  <h3><a name="hw">Hardware List</a></h3>
-
-  <p>A list of supported CPUs may be found in the <a
-    href="&base;/releases/&rel.current;R/hardware.html#PROC-I386">FreeBSD/i386
-      Hardware Notes</a>.</p>
-
   <h3><a name="links">Points of Interest</a></h3>
 
   <ul>

==== //depot/projects/docproj_hu/www/en/where.sgml#6 (text+ko) ====

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.102 2009/12/14 13:16:43 pav Exp $">
+<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.103 2010/01/21 20:55:04 jkois Exp $">
 <!ENTITY title "Getting FreeBSD">
 <!ENTITY % navinclude.download "INCLUDE">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
@@ -102,64 +102,46 @@
 	<tr>
 	  <td colspan="2">FreeBSD &rel2.current;-RELEASE</td>
 	  <td colspan="2"></td>
-	  <td><a href="&base;/releases/&rel2.current;R/relnotes.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/hardware.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/installation.html">[View]</a></td>
+	  <td rowspan="7"><a href="&base;/releases/&rel2.current;R/relnotes.html">[View]</a></td>
+	  <td rowspan="7"><a href="&base;/releases/&rel2.current;R/hardware.html">[View]</a></td>
+	  <td rowspan="7"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">[View]</a></td>
 	  <td rowspan="7"><a href="&base;/releases/&rel2.current;R/errata.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
-	  <td>alpha</td>
-	  <td><a href="&url.rel;/alpha/&rel2.current;-RELEASE/">[Distribution]</a></td>
-	  <td><a href="&url.rel;/alpha/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/relnotes-alpha.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/hardware-alpha.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/installation-alpha.html">[View]</a></td>
-	</tr>
-	<tr>
-	  <td></td>
 	  <td>amd64</td>
 	  <td><a href="&url.rel;/amd64/&rel2.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/relnotes-amd64.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/hardware-amd64.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/installation-amd64.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>i386</td>
-	  <td><a href="&url.rel;/i386/&rel2.current;-RELEASE/">[Distribution]</a></td>
+	  <td><a href="&url.rel;/i386/&rel2.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/i386/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/relnotes-i386.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/hardware-i386.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/installation-i386.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>ia64</td>
 	  <td><a href="&url.rel;/ia64/&rel2.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/ia64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/relnotes-ia64.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/hardware-ia64.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/installation-ia64.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>pc98</td>
 	  <td><a href="&url.rel;/pc98/&rel2.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/relnotes-pc98.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/hardware-pc98.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/installation-pc98.html">[View]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>powerpc</td>
+	  <td><a href="&url.rel;/powerpc/&rel2.current;-RELEASE">[Distribution]</a></td>
+	  <td><a href="&url.rel;/powerpc/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>sparc64</td>
 	  <td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/relnotes-sparc64.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/hardware-sparc64.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/installation-sparc64.html">[View]</a></td>
 	</tr>
       </tbody>
     </table>

==== //depot/projects/docproj_hu/www/hu/events/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/hu/events/Makefile,v 1.1 2009/04/06 17:56:08 pgj Exp $
+# $FreeBSD: www/hu/events/Makefile,v 1.2 2010/01/20 14:19:58 pgj Exp $
 
 ###################################################
 # The FreeBSD Hungarian Documentation Project     #

==== //depot/projects/docproj_hu/www/share/sgml/events.xml#24 (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/events.xml,v 1.79 2009/11/17 07:29:02 brueffer Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.80 2010/01/20 17:16:06 brueffer Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -158,6 +158,28 @@
       from commercial vendors.</description>
   </event>
 
+  <event id="openexpo-2010">
+    <name>OpenExpo 2010</name>
+    <url>http://www.openexpo.ch/</url>
+    <startdate>
+      <year>2010</year>
+      <month>3</month>
+      <day>24</day>
+    </startdate>
+    <enddate>
+      <year>2010</year>
+      <month>3</month>
+      <day>25</day>
+    </enddate>
+    <location>
+      <country code="CH">Switzerland</country>
+      <city>Bern</city>
+    </location>
+    <description>The goal of OpenExpo is the promotion of Open Source
+      software in the business environment.  Among many others, there
+      will be a FreeBSD booth.</description>
+  </event>
+
   <event id="linuxexpofr-2010">
     <name>Solutions Linux 2010</name>
     <url>http://www.solutionslinux.fr/</url>
@@ -210,6 +232,30 @@
       the widest possible audience.</description>
   </event>
 
+  <event id="scale-2010">
+    <name>SCALE: Southern California Linux Expo 2010</name>
+    <url>http://www.socallinuxexpo.org/</url>
+    <startdate>
+      <year>2010</year>
+      <month>2</month>
+      <day>19</day>
+    </startdate>
+    <enddate>
+      <year>2010</year>
+      <month>2</month>
+      <day>21</day>
+    </enddate>
+    <location>
+      <country code="US">USA</country>
+      <state>California</state>
+      <city>Los Angeles</city>
+      <site>The Westin Los Angeles Airport</site>
+    </location>
+    <description>There will be a FreeBSD booth at the 8th annual
+      Southern California Linux Expo in February.  Futhermore Dru Lavigne will
+      give a talk about BSD for Linux users.</description>
+  </event>
+
   <event id="fosdem-2010">
     <name>FOSDEM '10</name>
     <url>http://fosdem.org/2010/</url>

==== //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#11 (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.82 2009/11/05 12:24:41 remko Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.83 2010/01/21 21:48:07 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -720,6 +720,22 @@
     </description>
   </entry>
 
+  <entry id="pbclug">
+    <name>Palm Beach County Linux Users Group</name>
+    <url>http://groups.yahoo.com/group/pbclinux</url>
+    <description>We are a user group for discussion and advocacy of
+      Linux, FreeBSD and other Open Source operating systems and Open
+      Source software.  While most members run Linux systems, there are
+      FreeBSD users in the group.  Discussion and questions on any
+      Open Source operating system topic or on Open Source software
+      in general is welcome.  The organization also actively
+      participates in events such as Software Freedom Day.
+      Send us an <a href="mailto:pbclug at Comcast.net">email</a> or
+      join our <a
+      href="http://groups.yahoo.com/group/pbclinux">mailinglist</a>.
+    </description>
+  </entry>
+
   <entry id="phoenix">
     <name>Phoenix BSD Users Group</name>
     <url>http://bsd.phoenix.az.us</url>


More information about the p4-projects mailing list