PERFORCE change 170696 for review

Rene Ladan rene at FreeBSD.org
Tue Nov 17 11:25:29 UTC 2009


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

Change 170696 by rene at rene_self on 2009/11/17 11:24:47

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#16 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#11 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#16 integrate
.. //depot/projects/docproj_nl/share/images/articles/checkpoint/networks.pic#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/query-pr.cgi#4 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#23 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#56 integrate
.. //depot/projects/docproj_nl/www/share/sgml/press.xml#18 integrate
.. //depot/projects/docproj_nl/www/share/sgml/release.ent#18 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml,v 1.7 2005/10/26 12:14:47 keramida Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml,v 1.8 2009/11/14 22:20:12 manolis Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -16,7 +16,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml,v 1.7 2005/10/26 12:14:47 keramida Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml,v 1.8 2009/11/14 22:20:12 manolis Exp $</pubdate>
 
     <copyright>
       <year>2004</year>
@@ -283,7 +283,7 @@
 	      <para>Please use an appropriate human language for a
 		particular mailing list.  Many non-English mailing
 		lists are
-		<ulink url="&url.base;/support.html#mailing-list-languages">
+		<ulink url="&url.base;/community/mailinglists.html">
 		available</ulink>.</para>
 
 	      <para>For the ones that are not, we do appreciate that many

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#16 (text+ko) ====

@@ -11,7 +11,7 @@
       <corpauthor>The &os; Ports Management Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.44 2009/08/05 01:48:18 linimon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.47 2009/11/13 03:24:31 linimon Exp $</pubdate>
 
     <copyright>
       <year>2003</year>
@@ -47,14 +47,14 @@
       otherwise specified, all paths will be relative to
       this location.  <replaceable>${arch}</replaceable> will
       be used to specify one of the package architectures
-      (amd64, &i386;, and &sparc64;), and
+      (amd64, &i386;, ia64, powerpc, and &sparc64;), and
       <replaceable>${branch}</replaceable> will be used
-      to specify the build branch (6, 6-exp, 7, 7-exp, 8, 8-exp).
+      to specify the build branch (6, 7, 7-exp, 8, 8-exp, 9, 9-exp).
     </para>
 
     <note>
       <para>Packages are no longer built for Release 4 or 5, nor
-	for the alpha nor ia64 architectures.</para>
+	for the alpha architecture.</para>
     </note>
 
     <para>The scripts that control all of this live in
@@ -141,7 +141,6 @@
 
     <screen>/var/portbuild&prompt.root; <userinput>scripts/mkbindist <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable></userinput></screen>
 
-    <!-- XXX MCL still true? -->
     <para>The per-machine tarballs are located in
       <filename><replaceable>${arch}</replaceable>/clients</filename>.</para>
 
@@ -180,13 +179,6 @@
       </listitem>
 
       <listitem>
-	<para><command>dopackages.6-exp</command> - Perform
-	  a 6.X build with experimental patches
-	  (6-exp branch)
-	</para>
-      </listitem>
-
-      <listitem>
 	<para><command>dopackages.7</command> - Perform
 	  a 7.X build
 	</para>
@@ -476,6 +468,15 @@
 	</listitem>
 
 	<listitem>
+	  <para><literal>build create <replaceable>arch</replaceable>
+	    <replaceable>branch</replaceable>
+	    [<replaceable>newid</replaceable>]</literal> - Creates
+	    <replaceable>newid</replaceable> (or a datestamp if not specified).
+	    Only needed when bringing up a new branch or a new architecture.
+	  </para>
+	</listitem>
+
+	<listitem>
 	  <para><literal>build clone <replaceable>arch</replaceable>
 	    <replaceable>branch</replaceable> <replaceable>oldid</replaceable>
 	    [<replaceable>newid</replaceable>]</literal> - Clones
@@ -633,7 +634,7 @@
 
     <para>To free up resources, you will need to clean up client machines by
       running <command>build cleanup</command> command.  For example:
-      <screen>&prompt.user; <userinput>/var/portbuild/scripts/build cleanup i386 6-exp 20080714120411 -full</userinput></screen>
+      <screen>&prompt.user; <userinput>/var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full</userinput></screen>
 
     <para>If you forget to do this, then the old build
       <literal>chroot</literal>s will not be cleaned up for 24 hours, and no
@@ -656,8 +657,8 @@
 
       will get you a df, and
 
-<screen>allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/6-exp/ports"
-allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/6-exp/src"</screen>
+<screen>allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports"
+allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/src"</screen>
 
       are supposed to get rid of the hanging mounts.  You will have to
       keep doing them since there can be multiple mounts.</para>
@@ -665,10 +666,10 @@
     <note>
       <para>Ignore the following:
 
-<screen>umount: pointyhat.freebsd.org:/var/portbuild/i386/6-exp/ports: statfs: No such file or directory
-umount: pointyhat.freebsd.org:/var/portbuild/i386/6-exp/ports: unknown file system
-umount: Cleanup of /x/tmp/6-exp/chroot/53837/compat/linux/proc failed!
-/x/tmp/6-exp/chroot/53837/compat/linux/proc: not a file system root directory</screen>
+<screen>umount: pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports: statfs: No such file or directory
+umount: pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports: unknown file system
+umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
+/x/tmp/8-exp/chroot/53837/compat/linux/proc: not a file system root directory</screen>
 
       The former 2 mean that that client did not have those mounted;
       the latter 2 are a bug.</para>
@@ -925,7 +926,11 @@
       </listitem>
 
       <listitem>
-	<para><literal>packages-8-current</literal></para>
+	<para><literal>packages-8-stable</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>packages-9-current</literal></para>
       </listitem>
     </itemizedlist>
 
@@ -1000,7 +1005,7 @@
       new features or bugfixes to the ports infrastructure (i.e.
       <filename>bsd.port.mk</filename>), or to test large sweeping
       upgrades.  The current experimental patches branch is
-      <literal>7-exp</literal> on the amd64
+      <literal>8-exp</literal> on the amd64
       architecture.</para>
 
     <para>In general, an experimental patches build is run the same
@@ -1048,21 +1053,21 @@
 
     <para>Once the build finishes, compare the control build failures
       to those of the experimental patches build.  Use the following
-      commands to facilitate this (this assumes the <literal>7</literal>
-      branch is the control branch, and the <literal>7-exp</literal>
+      commands to facilitate this (this assumes the <literal>8</literal>
+      branch is the control branch, and the <literal>8-exp</literal>
       branch is the experimental patches branch):</para>
 
-    <screen>&prompt.user; <userinput>cd /var/portbuild/i386/7-exp/errors</userinput>
-&prompt.user; <userinput>find . -name \*.log\* | sort > /tmp/7-exp-errs</userinput>
-&prompt.user; <userinput>cd /var/portbuild/i386/7/errors</userinput>
-&prompt.user; <userinput>find . -name \*.log\* | sort > /tmp/7-errs</userinput></screen>
+    <screen>&prompt.user; <userinput>cd /var/portbuild/i386/8-exp/errors</userinput>
+&prompt.user; <userinput>find . -name \*.log\* | sort > /tmp/8-exp-errs</userinput>
+&prompt.user; <userinput>cd /var/portbuild/i386/8/errors</userinput>
+&prompt.user; <userinput>find . -name \*.log\* | sort > /tmp/8-errs</userinput></screen>
 
     <note><para>If it has been a long time since one of the builds
       finished, the logs may have been automatically compressed with
       bzip2.  In that case, you must use <literal>sort | sed
       's,\.bz2,,g'</literal> instead.</para></note>
 
-    <screen>&prompt.user; <userinput>comm -3 /tmp/7-errs /tmp/7-exp-errs | less</userinput></screen>
+    <screen>&prompt.user; <userinput>comm -3 /tmp/8-errs /tmp/8-exp-errs | less</userinput></screen>
 
     <para>This last command will produce a two-column report.  The
       first column is ports that failed on the control build but not in
@@ -1117,7 +1122,7 @@
       To differentiate between [1] and [2] above, you can do a rebuild
       of the affected packages under the control branch:</para>
 
-    <screen>&prompt.user; <userinput>cd /var/portbuild/i386/7/ports</userinput></screen>
+    <screen>&prompt.user; <userinput>cd /var/portbuild/i386/8/ports</userinput></screen>
 
     <note><para>Be sure to <literal>cvs update</literal> this tree to the same date as
       the experimental patches tree.</para></note>
@@ -1125,14 +1130,14 @@
     <para>The following command will set up the control branch for
       the partial build:</para>
 
-    <screen>&prompt.user; <userinput>/var/portbuild/scripts/dopackages.7 -noportscvs -nobuild -nocvs -nofinish</userinput></screen>
+    <screen>&prompt.user; <userinput>/var/portbuild/scripts/dopackages.8 -noportscvs -nobuild -nocvs -nofinish</userinput></screen>
 
     <para>The builds must be performed from the
       <literal>packages/All</literal> directory.  This directory should
       initially be empty except for the Makefile symlink.  If this
       symlink does not exist, it must be created:</para>
 
-    <screen>&prompt.user; <userinput>cd /var/portbuild/i386/7/packages/All</userinput>
+    <screen>&prompt.user; <userinput>cd /var/portbuild/i386/8/packages/All</userinput>
 &prompt.user; <userinput>ln -sf ../../Makefile .</userinput>
 &prompt.user; <userinput>make -k -j&lt;#&gt; &lt;list of packages to build&gt;</userinput></screen>
 
@@ -1298,11 +1303,16 @@
 	  <para>Generate a kernel config file.  Include
 	    <literal>GENERIC</literal> (or, if you are using more than
 	    3.5G on &i386;, <literal>PAE</literal>).
+	  </para>
+	  <para>
+	    Required options:<screen>
+options         NULLFS
+options         TMPFS</screen>
+	  </para>
+	  <para>
 	    Suggested options:<screen>
 options         GEOM_CONCAT
 options         GEOM_STRIPE
-options         NULLFS
-options         TMPFS
 options         SHMMAXPGS=65536
 options         SEMMNI=40
 options         SEMMNS=240
@@ -1314,7 +1324,8 @@
 	  </para>
 
 	  <para>For <literal>PAE</literal>, it is not currently possible
-	    to load modules.  Therefore, you will need to add:<screen>
+	    to load modules.  Therefore, if you are running an architecture
+	    that supports Linux emulation, you will need to add:<screen>
 options         COMPAT_LINUX
 options         LINPROCFS</screen>
 	  </para>
@@ -1532,12 +1543,16 @@
 
 	    <listitem>
 	      <para>Create
-		 <filename>usr/local/etc/rc.d/portbuild.sh</filename>:<screen>
+		 <filename>usr/local/etc/rc.d/portbuild.sh</filename>,
+		 using the appropriate value for
+		 <literal>scratchdir</literal>:<screen>
 #!/bin/sh
 #
-# Configure the system post-boot
+# Configure a package build system post-boot
+
+scratchdir=/usr2
 
-ln -sf /usr2/portbuild /var/portbuild
+ln -sf ${scratchdir}/portbuild /var/portbuild
 
 # Identify builds ready for use
 cd /var/portbuild/${arch}
@@ -1550,11 +1565,20 @@
 # Flag that we are ready to accept jobs
 touch /tmp/.boot_finished</screen>
 	      </para>
+	    </listitem>
 
-	      <!-- XXX MCL adapted literally from krismail; I do not understand it -->
-	      <para>If there are machines from more than one cluster in the
-		same multicast domain (basically = LAN) then change the
-		multicast groups to different values (.71, .72, etc).</para>
+	    <listitem>
+	      <para>Modify
+		 <filename>usr/local/etc/rc.d/squid</filename>:<screen>
+40c40
+< squid_chdir=${squid_chdir:-"/usr/local/squid/logs"}
+---
+> squid_chdir=${squid_chdir:-"/usr2/squid/logs"}
+43c43
+< squid_pidfile=${squid_pidfile:-"/usr/local/squid/logs/squid.pid"}
+---
+> squid_pidfile=${squid_pidfile:-"/usr2/squid/logs/squid.pid"}</screen>
+	      </para>
 	    </listitem>
 
 	    <listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#5 (text+ko) ====

@@ -37,7 +37,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.83 2009/06/24 22:25:26 keramida Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.84 2009/11/13 10:21:30 remko Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -798,6 +798,17 @@
         should be made bootable so that users of modern PCs do not
         need to create installation floppy disks.</para>
 
+      <para>If a custom kernel of &os; is to be included, then
+        &man.sysinstall.8; and &man.release.7; must be updated to
+        include installation instructions. The relevant code is contained
+        in <filename>src/release</filename> and <filename>src/usr.sbin/sysinstall</filename>.
+        Specifically, the file <filename>src/release/Makefile</filename>, and 
+        <filename>dist.c</filename>, <filename>dist.h</filename>,
+        <filename>menus.c</filename>, <filename>install.c</filename>, and 
+        <filename>Makefile</filename> will need to be updated under
+        <filename>src/usr.sbin/sysinstall</filename>.  Optionally, you may choose 
+        to update <filename>sysinstall.8</filename>.</para>
+
       <para>If an alternate version of &xfree86; is to be provided, then
         &man.sysinstall.8; must be updated to reflect the new location
         and installation instructions. The relevant code is contained

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.196 2009/11/07 11:41:31 remko Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.197 2009/11/17 07:22:48 manolis Exp $
 -->
 
 <chapter id="x11">
@@ -477,16 +477,28 @@
       <screen>&prompt.root; <userinput>Xorg -config xorg.conf.new -retro</userinput></screen>
 
       <para>If a black and grey grid and an X mouse cursor appear,
-        the configuration was successful.  To exit the test, just press
+        the configuration was successful.  To exit the test, switch to the
+	virtual console used to start it by pressing
         <keycombo action="simul">
           <keycap>Ctrl</keycap>
           <keycap>Alt</keycap>
-          <keycap>Backspace</keycap>
-        </keycombo> simultaneously.</para>
+          <keycap>F<replaceable>n</replaceable></keycap>
+        </keycombo> (<keycap>F1</keycap> for the first virtual console)
+	and press
+	<keycombo action="simul">
+	  <keycap>Ctrl</keycap>
+	  <keycap>C</keycap>
+	</keycombo>.</para>
 
       <note>
-	<para>This key combination was enabled by default up to
-	  <application>&xorg;</application> version 7.3.  To enable it in
+	<para>In <application>&xorg;</application> versions up to 7.3,
+	  the
+	  <keycombo action="simul">
+	    <keycap>Ctrl</keycap>
+	    <keycap>Alt</keycap>
+	    <keycap>Backspace</keycap>
+	  </keycombo> key combination could be used to break out of
+	  <application>&xorg;</application>.  To enable it in
 	  version 7.4 and later, you can either type the following
 	  command from any X terminal emulator:</para>
 
@@ -511,6 +523,13 @@
 
 	<para>You will have to reboot your machine to force
 	  <application>hald</application> to read this file.</para>
+
+	<para>The following line will also have to be added to
+	  <filename>xorg.conf.new</filename>, in the
+	  <literal>ServerLayout</literal> or <literal>ServerFlags</literal>
+	  section:</para>
+
+	<programlisting>Option	"DontZap"	"off"</programlisting>
       </note>
 
 	<para>If the mouse does not work, you will need to first

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

@@ -1,7 +1,7 @@
 <!--
     The FreeBSD Dutch Documentation Project
 
-    $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml,v 1.4 2009/06/10 06:34:09 rene Exp $
+    $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml,v 1.5 2009/11/11 18:46:15 rene Exp $
 
     %SOURCE%	en_US.ISO8859-1/books/handbook/jails/chapter.sgml
     %SRCID%	1.19

==== //depot/projects/docproj_nl/share/images/articles/checkpoint/networks.pic#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" $FreeBSD: doc/share/images/articles/checkpoint/networks.pic,v 1.1 2003/04/11 08:59:19 blackend Exp $
+.\" $FreeBSD: doc/share/images/articles/checkpoint/networks.pic,v 1.2 2009/11/13 08:51:10 roam Exp $
 .\"
 .PS
 
@@ -24,7 +24,7 @@
     "\fC\s-2199.208.192.0/24\s+2\fP" "FW-1 protected nets" \
     with .nw at G.w;
 box wid 1.2 invis \
-    "\fC\s-2199.208.192.0/24\s+2\fP" "internal nets" \
+    "\fC\s-2192.168.10.0/24\s+2\fP" "internal nets" \
     with .ne at I.e;
 
 .PE

==== //depot/projects/docproj_nl/www/en/cgi/query-pr.cgi#4 (text+ko) ====

@@ -26,7 +26,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.66 2009/09/29 19:45:37 simon Exp $
+# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.69 2009/11/15 18:40:26 remko Exp $
 #
 
 #
@@ -474,6 +474,7 @@
 		my $url = "${self_url_base}${PR}";
 
 		my $outp = "";
+		my $qpcont = "";
 		my %mime_headers;
 		my $mime_boundary;
 		my $mime_endheader;
@@ -596,6 +597,21 @@
 				if ($inresponse) {
 					my $txt = $1;
 
+					# Detect Q-P line continuations,
+					# join them with the next line
+					# and process when the full line
+					# will be assembled.
+					if ($encoding == ENCODING_QP) {
+						if ($txt =~ /=$/) {
+							$txt =~ s/=$//;
+							$qpcont .= $txt;
+							next;
+						} else {
+							$txt = $qpcont . $txt;
+							$qpcont = "";
+						}
+					}
+
 					if ($txt !~ /^-+$/ && $txt !~ /(?:cut|snip)/i && $txt =~ /^--(\S+)$/) {
 						$mime_boundary = $1 if (!defined $mime_boundary && !$inpatch);
 
@@ -657,11 +673,10 @@
 					}
 
 					if ($encoding == ENCODING_BASE64) {
+						next if $txt =~ /:/;
 						$outp .= $txt;
 						next;
 					} elsif ($encoding == ENCODING_QP) {
-						# XXX: lines ending in = should be joined
-						$txt =~ s/=$//;
 						$txt = decode_qp($txt);
 					}
 
@@ -1013,7 +1028,7 @@
 	}
 
 	if (($inpatch & PATCH_BASE64) && $getpatch) {
-		$outp .= $_;
+		$outp .= $_ unless /:/;
 		return 1;
 	}
 
@@ -1107,8 +1122,8 @@
 						unless (!$getpatch and $inpatch & PATCH_UUENC_BIN);
 					$outp = htmlclean($outp) unless ($getpatch);
 					print $outp;
-					$inpatch ^= PATCH_UUENC; $outp = "";
-					$inpatch ^= PATCH_UUENC_BIN;
+					$outp = "";
+					$inpatch &= ~(PATCH_UUENC | PATCH_UUENC_BIN);
 
 					# No outer container?
 					sprint('patchblock_tfoot') if (!$inpatch and !$getpatch);

==== //depot/projects/docproj_nl/www/share/sgml/events.xml#23 (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.78 2009/11/08 14:27:01 brueffer Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.79 2009/11/17 07:29:02 brueffer Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -111,6 +111,28 @@
       track, tutorials, and FreeBSD developer summit.</description>
   </event>
 
+  <event id="lsm-2010">
+    <name>11th Libre Software Meeting</name>
+    <url>http://2010.rmll.info/</url>
+    <startdate>
+      <year>2010</year>
+      <month>7</month>
+      <day>6</day>
+    </startdate>
+    <enddate>
+      <year>2010</year>
+      <month>7</month>
+      <day>11</day>
+    </enddate>
+    <location>
+      <country code="FR">France</country>
+      <city>Bordeaux</city>
+    </location>
+    <description>The Libre Software Meeting has occurred each year
+      since July 2000.  This year there will again be a &os; boot
+      camp to introduce new users to the Operating System.</description>
+  </event>
+
   <event id="bsdcan-2010">
     <name>BSDCan 2010</name>
     <url>http://www.bsdcan.org/2010/</url>
@@ -136,6 +158,31 @@
       from commercial vendors.</description>
   </event>
 
+  <event id="linuxexpofr-2010">
+    <name>Solutions Linux 2010</name>
+    <url>http://www.solutionslinux.fr/</url>
+    <startdate>
+      <year>2010</year>
+      <month>3</month>
+      <day>16</day>
+    </startdate>
+    <enddate>
+      <year>2010</year>
+      <month>3</month>
+      <day>18</day>
+    </enddate>
+    <location>
+      <country code="FR">France</country>
+      <city>Paris</city>
+      <site>Paris Expo</site>
+      <address>Porte de Versailles</address>
+    </location>
+    <description>A 3 days event to promote GNU/Linux and Open Source
+      Software to companies.  As usual, a French &os; User Group will
+      be there to promote &os;.  The access to the event is free of
+      charge.</description>
+  </event>
+
   <event id="asiabsdcon-2010">
     <name>AsiaBSDCon 2010</name>
     <url>http://2010.asiabsdcon.org/</url>

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#56 (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.276 2009/11/09 05:24:00 linimon Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.277 2009/11/12 22:58:14 delphij Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -33,6 +33,27 @@
     <name>2009</name>
 
     <month>
+      <name>11</name>
+
+      <day>
+	<name>12</name>
+
+	<event>
+	  <title>&os; 8.0-RC3 Available</title>
+
+	  <p>The third of the Release Candidates for the &os;-8.0
+	    release cycle is now available.  ISO images for Tier-1
+	    architectures and a <em>memory stick</em> image for
+	    amd64/i386 are now <a
+	    href="http://lists.freebsd.org/pipermail/freebsd-stable/2009-November/052699.html">available</a>
+	    on most of the <a
+	    href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+	    mirror sites</a>.</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>10</name>
 
       <day>

==== //depot/projects/docproj_nl/www/share/sgml/press.xml#18 (text+ko) ====

@@ -9,7 +9,7 @@
 <press>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/press.xml,v 1.88 2009/09/03 16:58:37 jkoshy Exp $
+      $FreeBSD: www/share/sgml/press.xml,v 1.90 2009/11/12 14:02:25 jkoshy Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -17,6 +17,30 @@
     <name>2009</name>
 
     <month>
+      <name>11</name>
+
+      <story>
+	<name>FreeNAS 0.7 adds ZFS support</name>
+	<url>http://www.h-online.com/open/news/item/FreeNAS-0-7-adds-ZFS-support-853475.html</url>
+	<site-name>The H</site-name>
+	<site-url>http://www.h-online.com/</site-url>
+	<date>09 November 2009</date>
+	<author>crve</author>
+	<p>A description of the new features in version 0.7 of the FreeBSD-based FreeNAS project.</p>
+      </story>
+
+      <story>
+	<name>Update your FreeBSD software with care</name>
+	<url>http://blogs.techrepublic.com.com/security/?p=2615</url>
+	<site-name>Tech Republic</site-name>
+	<site-url>http://www.techrepublic.com/</site-url>
+	<date>09 November 2009</date>
+	<author>Chad Perrin</author>
+	<p>Chad Perrin describes how he keeps his FreeBSD system up to date.</p>
+      </story>
+    </month>
+
+    <month>
       <name>8</name>
 
       <story>

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/release.ent,v 1.38 2009/10/28 15:01:11 brueffer Exp $ -->
+<!-- $FreeBSD: www/share/sgml/release.ent,v 1.39 2009/11/13 12:39:29 danger Exp $ -->
 
 <!-- XXX rel.current and u.rel.* should be available in doc/ -->
 <!-- The currently released versions of FreeBSD.  This value is used to
@@ -31,7 +31,7 @@
 <!ENTITY beta.testing "INCLUDE">
 <!ENTITY % beta.testing "INCLUDE">
 <!ENTITY betarel.current '8.0'>
-<!ENTITY betarel.vers 'RC2'>
+<!ENTITY betarel.vers 'RC3'>
 <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
 
 <!-- If we have a second release in the release cycle (e.g. 5.x and 6.y


More information about the p4-projects mailing list