Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Oct 2008 19:18:19 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 151333 for review
Message-ID:  <200810131918.m9DJIJnD060360@repoman.freebsd.org>

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

Change 151333 by rene@rene_self on 2008/10/13 19:17:21

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#7 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#6 integrate
.. //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#5 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#4 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#12 integrate
.. //depot/projects/docproj_nl/www/share/sgml/release.ent#3 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#3 (text+ko) ====

@@ -23,7 +23,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml,v 1.7 2008/05/28 21:36:45 keramida Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml,v 1.8 2008/10/11 10:43:29 brueffer Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -460,7 +460,7 @@
     <listitem><para>The BSD license is preferable for transferring
       research results in a way that will widely be deployed and most
       benefit an economy. As such, research funding agencies, such as
-      the NFS, ONR and DARPA, should encourage in the earliest phases
+      the NSF, ONR and DARPA, should encourage in the earliest phases
       of funded research projects, the adoption of BSD style licenses
       for software, data, results, and open hardware.  They should
       also encourage formation of standards based around implemented

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 (text+ko) ====

@@ -27,7 +27,7 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.32 2005/08/31 20:21:28 simon Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.33 2008/10/13 06:57:53 pgj Exp $
 -->
 
 <chapter id="tools">
@@ -57,13 +57,13 @@
       automatically download and install all of the packages listed in this
       chapter that you need.</para>
 
-    <para>One of the packages that you might need is the JadeTeX macro set.
+    <para>One of the packages that you might need is the <application>JadeTeX</application> macro set.
       In turn, this macro set requires &tex; to be installed.  &tex; is a large
       package, and you only need it if you want to produce Postscript or PDF
       output.</para>
 
     <para>To save yourself time and space you must specify whether or not you
-      want JadeTeX (and therefore &tex;) installed when you install this port.
+      want <application>JadeTeX</application> (and therefore &tex;) installed when you install this port.
       Either do:</para>
 
       <screen>&prompt.root; <userinput>make JADETEX=yes install</userinput></screen>

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

@@ -1,7 +1,7 @@
 <!--
     The FreeBSD Documentation Project
 
-    $FreeBSD: doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml,v 1.16 2008/08/06 22:03:50 pgj Exp $
+    $FreeBSD: doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml,v 1.17 2008/10/11 14:05:57 jkois Exp $
 -->
 <chapter id="jails">
   <chapterinfo>
@@ -342,6 +342,7 @@
 	  <para>For a full list of available options, please see the
 	    &man.rc.conf.5; manual page.</para>
 	</note>
+      </step>
     </procedure>
 
     <para>The <filename>/etc/rc.d/jail</filename> script can be used to

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

@@ -1,7 +1,7 @@
 <!--
      Names of FreeBSD mailing lists and related software.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent,v 1.63 2008/10/08 17:51:04 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent,v 1.64 2008/10/11 09:12:27 manolis Exp $
 -->
 
 <!ENTITY a.mailman.listinfo "http://lists.FreeBSD.org/mailman/listinfo">;
@@ -397,51 +397,51 @@
 
 <!ENTITY a.svn-src-all.url "&a.mailman.listinfo;/svn-src-all">
 <!ENTITY a.svn-src-all "<ulink url='&a.svn-src-all.url;'>SVN commit messages for the entire src tree (except for <quote>user</quote> and <quote>projects</quote>)</ulink>">
-<!ENTITY a.svn-src-all.name "<ulink url='&a.svn-src-all;'>svn-src-all</ulink>">
+<!ENTITY a.svn-src-all.name "<ulink url='&a.svn-src-all.url;'>svn-src-all</ulink>">
 
 <!ENTITY a.svn-src-head.url "&a.mailman.listinfo;/svn-src-head">
 <!ENTITY a.svn-src-head "<ulink url='&a.svn-src-head.url;'>SVN commit messages for the src tree for head/-current</ulink>">
-<!ENTITY a.svn-src-head.name "<ulink url='&a.svn-src-head;'>svn-src-head</ulink>">
+<!ENTITY a.svn-src-head.name "<ulink url='&a.svn-src-head.url;'>svn-src-head</ulink>">
 
 <!ENTITY a.svn-src-projects.url "&a.mailman.listinfo;/svn-src-projects">
 <!ENTITY a.svn-src-projects "<ulink url='&a.svn-src-projects.url;'>SVN commit messages for the src <quote>projects</quote> tree</ulink>">
-<!ENTITY a.svn-src-projects.name "<ulink url='&a.svn-src-projects;'>svn-src-projects</ulink>">
+<!ENTITY a.svn-src-projects.name "<ulink url='&a.svn-src-projects.url;'>svn-src-projects</ulink>">
 
 <!ENTITY a.svn-src-release.url "&a.mailman.listinfo;/svn-src-release">
 <!ENTITY a.svn-src-release "<ulink url='&a.svn-src-release.url;'>SVN commit messages for releases in the src tree</ulink>">
-<!ENTITY a.svn-src-release.name "<ulink url='&a.svn-src-release;'>svn-src-release</ulink>">
+<!ENTITY a.svn-src-release.name "<ulink url='&a.svn-src-release.url;'>svn-src-release</ulink>">
 
 <!ENTITY a.svn-src-releng.url "&a.mailman.listinfo;/svn-src-releng">
 <!ENTITY a.svn-src-releng "<ulink url='&a.svn-src-releng.url;'>SVN commit messages for the release engineering&nbsp;/ security commits to the src tree</ulink>">
-<!ENTITY a.svn-src-releng.name "<ulink url='&a.svn-src-releng;'>svn-src-releng</ulink>">
+<!ENTITY a.svn-src-releng.name "<ulink url='&a.svn-src-releng.url;'>svn-src-releng</ulink>">
 
 <!ENTITY a.svn-src-stable.url "&a.mailman.listinfo;/svn-src-stable">
 <!ENTITY a.svn-src-stable "<ulink url='&a.svn-src-stable.url;'>SVN commit messages for all the -stable branches of the src tree</ulink>">
-<!ENTITY a.svn-src-stable.name "<ulink url='&a.svn-src-stable;'>svn-src-stable</ulink>">
+<!ENTITY a.svn-src-stable.name "<ulink url='&a.svn-src-stable.url;'>svn-src-stable</ulink>">
 
 <!ENTITY a.svn-src-stable-6.url "&a.mailman.listinfo;/svn-src-stable-6">
 <!ENTITY a.svn-src-stable-6 "<ulink url='&a.svn-src-stable-6.url;'>SVN commit messages for only the 6-stable src tree</ulink>">
-<!ENTITY a.svn-src-stable-6.name "<ulink url='&a.svn-src-stable-6;'>svn-src-stable-6</ulink>">
+<!ENTITY a.svn-src-stable-6.name "<ulink url='&a.svn-src-stable-6.url;'>svn-src-stable-6</ulink>">
 
 <!ENTITY a.svn-src-stable-7.url "&a.mailman.listinfo;/svn-src-stable-7">
 <!ENTITY a.svn-src-stable-7 "<ulink url='&a.svn-src-stable-7.url;'>SVN commit messages for only the 7-stable src tree</ulink>">
-<!ENTITY a.svn-src-stable-7.name "<ulink url='&a.svn-src-stable-7;'>svn-src-stable-7</ulink>">
+<!ENTITY a.svn-src-stable-7.name "<ulink url='&a.svn-src-stable-7.url;'>svn-src-stable-7</ulink>">
 
 <!ENTITY a.svn-src-stable-other.url "&a.mailman.listinfo;/svn-src-stable-other">
 <!ENTITY a.svn-src-stable-other "<ulink url='&a.svn-src-stable-other.url;'>SVN commit messages for the old stable src trees</ulink>">
-<!ENTITY a.svn-src-stable-other.name "<ulink url='&a.svn-src-stable-other;'>svn-src-stable-other</ulink>">
+<!ENTITY a.svn-src-stable-other.name "<ulink url='&a.svn-src-stable-other.url;'>svn-src-stable-other</ulink>">
 
 <!ENTITY a.svn-src-svnadmin.url "&a.mailman.listinfo;/svn-src-svnadmin">
 <!ENTITY a.svn-src-svnadmin "<ulink url='&a.svn-src-svnadmin.url;'>SVN commit messages for the admin&nbsp;/ configuration tree</ulink>">
-<!ENTITY a.svn-src-svnadmin.name "<ulink url='&a.svn-src-svnadmin;'>svn-src-svnadmin</ulink>">
+<!ENTITY a.svn-src-svnadmin.name "<ulink url='&a.svn-src-svnadmin.url;'>svn-src-svnadmin</ulink>">
 
 <!ENTITY a.svn-src-user.url "&a.mailman.listinfo;/svn-src-user">
 <!ENTITY a.svn-src-user "<ulink url='&a.svn-src-user.url;'>SVN commit messages for the experimental <quote>user</quote> src tree</ulink>">
-<!ENTITY a.svn-src-user.name "<ulink url='&a.svn-src-user;'>svn-src-user</ulink>">
+<!ENTITY a.svn-src-user.name "<ulink url='&a.svn-src-user.url;'>svn-src-user</ulink>">
 
 <!ENTITY a.svn-src-vendor.url "&a.mailman.listinfo;/svn-src-vendor">
 <!ENTITY a.svn-src-vendor "<ulink url='&a.svn-src-vendor.url;'>SVN commit messages for the vendor work area tree</ulink>">
-<!ENTITY a.svn-src-vendor.name "<ulink url='&a.svn-src-vendor;'>svn-src-vendor</ulink>">
+<!ENTITY a.svn-src-vendor.name "<ulink url='&a.svn-src-vendor.url;'>svn-src-vendor</ulink>">
 
 <!ENTITY a.test.url "&a.mailman.listinfo;/freebsd-test">
 <!ENTITY a.test "<ulink url='&a.test.url;'>FreeBSD test mailing list</ulink>">

==== //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#6 (text+ko) ====

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
 <!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/en/releases/6.4R/schedule.sgml,v 1.8 2008/10/05 10:01:32 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/6.4R/schedule.sgml,v 1.9 2008/10/11 10:41:44 jkois Exp $">
 <!ENTITY local.rel "6.4">
 <!ENTITY local.rel.tag "6_4">
 <!ENTITY title "FreeBSD &local.rel; Release Process">
@@ -21,7 +21,7 @@
   <p>General discussions about the release engineering process or
     quality assurance issues should be sent to the public
     <a href="mailto:FreeBSD-qa@FreeBSD.org">freebsd-qa</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/faq/misc.html#DEFINE-MFC">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

==== //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
 <!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/en/releases/7.1R/schedule.sgml,v 1.7 2008/09/23 07:02:02 erwin Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/7.1R/schedule.sgml,v 1.8 2008/10/11 10:41:45 jkois Exp $">
 <!ENTITY local.rel "7.1">
 <!ENTITY local.rel.tag "7_1">
 <!ENTITY title "FreeBSD &local.rel; Release Process">
@@ -21,7 +21,7 @@
   <p>General discussions about the release engineering process or
     quality assurance issues should be sent to the public
     <a href="mailto:FreeBSD-qa@FreeBSD.org">freebsd-qa</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/faq/misc.html#DEFINE-MFC">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

==== //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#4 (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.53 2008/08/21 20:49:47 remko Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.54 2008/10/11 12:40:34 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.53 2008/08/21 20:49:47 remko Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.54 2008/10/11 12:40:34 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -2501,20 +2501,21 @@
     </description>
   </entry>
 
-  <entry id="strategite" category="europe">
-    <name>Strategite</name>
-    <url>http://www.strategite.fr</url>;
+  <entry id="zelites" category="europe">
+    <name>Zelites</name>
+    <url>http://www.zelites.org</url>;
     <description>
-      Strategite is a company based in Paris, France.  We offer many
+      Zelites is a company based in Le Mans, France.  We offer many
       services: Support, installation, maintenance, administration,
       configuration of servers like firewall, VPN, IDS, web server, mail
       server, DNS or whatever you need.  Our services offerings include
-      a high-level of security using *BSD (like FreeBSD, OpenBSD, NetBSD),
-      Linux, MacOS and commercial Unix systems is wide and is your
-      guaranty.  For more information, visit our
-      <a href="http://www.strategite.fr" title="Strategite">website</a>,
-      <a href="mailto:a.lunot@strategite.fr">mail us</a> or phone us at
-      +33 (0) 140 337 130.
+      a high-level of security.  Our knowledge of *BSD (like FreeBSD,
+      OpenBSD, NetBSD ..), Linux, MacOS and commercial Unix systems is
+      wide and is your guaranty.  For more information, visit our
+      <a href="http://www.zelites.org"
+        title="Zelites, Prestataire FreeBSD">website</a>,
+      <a href="mailto:info@zelites.org">mail us</a> or phone us at
+      +33 (0) 2 43 46 94 24.
     </description>
   </entry>
 

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#12 (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.200 2008/10/06 13:59:02 lstewart Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.202 2008/10/12 09:36:46 blackend Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -36,6 +36,21 @@
       <name>10</name>
 
       <day>
+	<name>12</name>
+
+	<event>
+	  <title>FreeBSD 6.4-RC1 Available</title>
+
+	  <p>The first release candidate of FreeBSD 6.4 is now <a
+	      href="http://lists.freebsd.org/pipermail/freebsd-stable/2008-October/045869.html">available</a>.
+	    ISO images for Tier-1 architectures are now available on
+	    most of the <a
+	      href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">;
+	      FreeBSD mirror sites</a>.</p>
+	</event>
+      </day>
+
+      <day>
         <name>6</name>
 
          <event>

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/release.ent,v 1.23 2008/09/13 23:49:28 danger Exp $ -->
+<!-- $FreeBSD: www/share/sgml/release.ent,v 1.24 2008/10/12 08:59:54 danger Exp $ -->
 
 <!-- XXX rel.current and u.rel.* should be available in doc/ -->
 <!-- The currently released versions of FreeBSD.  This value is used to
@@ -39,7 +39,7 @@
 <!ENTITY beta2.testing "INCLUDE">
 <!ENTITY % beta2.testing "INCLUDE">
 <!ENTITY betarel2.current '6.4'>
-<!ENTITY betarel2.vers 'BETA'>
+<!ENTITY betarel2.vers 'RC1'>
 <!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
 
 <!ENTITY rel.current.major '7'>



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