PERFORCE change 200026 for review

Rene Ladan rene at FreeBSD.org
Mon Oct 10 20:55:56 UTC 2011


http://p4web.freebsd.org/@@200026?ac=10

Change 200026 by rene at rene_acer on 2011/10/10 20:55:49

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#68 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#38 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/Makefile#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/book.sgml#7 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/bsdinstall/Makefile#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/chapters.ent#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#22 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#61 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#43 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#44 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#38 integrate
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-adduser1.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-adduser2.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-adduser3.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-boot-loader-menu.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-choose-mode.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-config-components.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-config-hostname.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-config-keymap.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-config-services.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv6.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-interface-slaac.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-interface.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-configure-network-ipv4-dns.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-distfile-extracting.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-distfile-fetching.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-distfile-verifying.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-final-confirmation.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-finalconfiguration.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-mainexit.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-netinstall-files.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-netinstall-mirrorselect.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-part-entire-part.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-part-guided-disk.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-part-guided-manual.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-part-manual-addpart.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-part-manual-create.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-part-manual-partscheme.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-part-review.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-post-root-passwd.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-set-clock-local-utc.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-timezone-confirm.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-timezone-country.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-timezone-region.png#1 branch
.. //depot/projects/docproj_nl/share/images/books/handbook/bsdinstall/bsdinstall-timezone-zone.png#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/melifaro.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#60 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#57 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#63 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events2011.xml#4 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#120 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#68 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.338 2011/09/28 22:55:05 jceel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.339 2011/10/06 14:02:25 melifaro Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -275,6 +275,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.melifaro;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.seanc;</para>
     </listitem>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#38 (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.75 2011/09/27 08:33:46 erwin Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.76 2011/10/09 03:35:00 linimon Exp $</pubdate>
 
     <copyright>
       <year>2003</year>
@@ -63,7 +63,7 @@
       be used to specify one of the package architectures
       (amd64, &i386;, ia64, powerpc, and &sparc64;), and
       <replaceable>${branch}</replaceable> will be used
-      to specify the build branch (7, 7-exp, 8, 8-exp, 9, 9-exp).
+      to specify the build branch (7, 7-exp, 8, 8-exp, 9, 9-exp, 10, 10-exp).
     </para>
 
     <note>
@@ -275,6 +275,19 @@
 	  (9-exp branch)
 	</para>
       </listitem>
+
+      <listitem>
+	<para><command>dopackages.10</command> - Perform
+	  a 10.X build
+	</para>
+      </listitem>
+
+      <listitem>
+	<para><command>dopackages.10-exp</command> - Perform
+	  a 10.X build with experimental patches
+	  (10-exp branch)
+	</para>
+      </listitem>
     </itemizedlist>
 
     <para>These are wrappers around <command>dopackages</command>,
@@ -1085,7 +1098,11 @@
       </listitem>
 
       <listitem>
-	<para><literal>packages-9-current</literal></para>
+	<para><literal>packages-9-stable</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>packages-10-current</literal></para>
       </listitem>
     </itemizedlist>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/Makefile#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.113 2010/08/18 20:23:36 blackend Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.116 2011/10/08 16:44:25 wblock Exp $
 #
 # Build the FreeBSD Handbook.
 #
@@ -50,6 +50,44 @@
 IMAGES_EN+= advanced-networking/natd.eps
 IMAGES_EN+= advanced-networking/net-routing.pic
 IMAGES_EN+= advanced-networking/static-routes.pic
+IMAGES_EN+= bsdinstall/bsdinstall-adduser1.png
+IMAGES_EN+= bsdinstall/bsdinstall-adduser2.png
+IMAGES_EN+= bsdinstall/bsdinstall-adduser3.png
+IMAGES_EN+= bsdinstall/bsdinstall-boot-loader-menu.png
+IMAGES_EN+= bsdinstall/bsdinstall-choose-mode.png
+IMAGES_EN+= bsdinstall/bsdinstall-config-components.png
+IMAGES_EN+= bsdinstall/bsdinstall-config-hostname.png
+IMAGES_EN+= bsdinstall/bsdinstall-config-keymap.png
+IMAGES_EN+= bsdinstall/bsdinstall-config-services.png
+IMAGES_EN+= bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png
+IMAGES_EN+= bsdinstall/bsdinstall-configure-network-interface-ipv4.png
+IMAGES_EN+= bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png
+IMAGES_EN+= bsdinstall/bsdinstall-configure-network-interface-ipv6.png
+IMAGES_EN+= bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png
+IMAGES_EN+= bsdinstall/bsdinstall-configure-network-interface-slaac.png
+IMAGES_EN+= bsdinstall/bsdinstall-configure-network-interface.png
+IMAGES_EN+= bsdinstall/bsdinstall-configure-network-ipv4-dns.png
+IMAGES_EN+= bsdinstall/bsdinstall-distfile-extracting.png
+IMAGES_EN+= bsdinstall/bsdinstall-distfile-fetching.png
+IMAGES_EN+= bsdinstall/bsdinstall-distfile-verifying.png
+IMAGES_EN+= bsdinstall/bsdinstall-final-confirmation.png
+IMAGES_EN+= bsdinstall/bsdinstall-finalconfiguration.png
+IMAGES_EN+= bsdinstall/bsdinstall-mainexit.png
+IMAGES_EN+= bsdinstall/bsdinstall-netinstall-files.png
+IMAGES_EN+= bsdinstall/bsdinstall-netinstall-mirrorselect.png
+IMAGES_EN+= bsdinstall/bsdinstall-part-entire-part.png
+IMAGES_EN+= bsdinstall/bsdinstall-part-guided-disk.png
+IMAGES_EN+= bsdinstall/bsdinstall-part-guided-manual.png
+IMAGES_EN+= bsdinstall/bsdinstall-part-manual-addpart.png
+IMAGES_EN+= bsdinstall/bsdinstall-part-manual-create.png
+IMAGES_EN+= bsdinstall/bsdinstall-part-manual-partscheme.png
+IMAGES_EN+= bsdinstall/bsdinstall-part-review.png
+IMAGES_EN+= bsdinstall/bsdinstall-post-root-passwd.png
+IMAGES_EN+= bsdinstall/bsdinstall-set-clock-local-utc.png
+IMAGES_EN+= bsdinstall/bsdinstall-timezone-confirm.png
+IMAGES_EN+= bsdinstall/bsdinstall-timezone-country.png
+IMAGES_EN+= bsdinstall/bsdinstall-timezone-region.png
+IMAGES_EN+= bsdinstall/bsdinstall-timezone-zone.png
 IMAGES_EN+= geom/striping.pic
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
@@ -205,6 +243,7 @@
 # SGML content
 SRCS+= audit/chapter.sgml
 SRCS+= book.sgml
+SRCS+= bsdinstall/chapter.sgml
 SRCS+= colophon.sgml
 SRCS+= dtrace/chapter.sgml
 SRCS+= freebsd-glossary.sgml

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/book.sgml#7 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.177 2011/01/10 19:02:37 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.178 2011/10/08 16:13:07 gjb Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -16,6 +16,7 @@
 
 <!ENTITY % chap.introduction "IGNORE">
 <!ENTITY % chap.install "IGNORE">
+<!ENTITY % chap.bsdinstall "IGNORE">
 <!ENTITY % chap.basics "IGNORE">
 <!ENTITY % chap.ports "IGNORE">
 <!ENTITY % chap.config "IGNORE">
@@ -195,6 +196,7 @@
 
     <![ %chap.introduction;             [ &chap.introduction;         ]]>
     <![ %chap.install;                  [ &chap.install;              ]]>
+    <![ %chap.bsdinstall;               [ &chap.bsdinstall;           ]]>
     <![ %chap.basics;                   [ &chap.basics;               ]]>
     <![ %chap.ports;                    [ &chap.ports;                ]]>
     <![ %chap.x11;                      [ &chap.x11;                  ]]>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/chapters.ent#4 (text+ko) ====

@@ -6,7 +6,7 @@
    
      Chapters should be listed in the order in which they are referenced.
  
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/chapters.ent,v 1.39 2008/12/23 18:59:03 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/chapters.ent,v 1.40 2011/10/08 15:51:47 gjb Exp $
 -->
 
 <!ENTITY chap.preface			SYSTEM "preface/preface.sgml">
@@ -14,6 +14,7 @@
 <!-- Part one -->
 <!ENTITY chap.introduction		SYSTEM "introduction/chapter.sgml">
 <!ENTITY chap.install			SYSTEM "install/chapter.sgml">
+<!ENTITY chap.bsdinstall		SYSTEM "bsdinstall/chapter.sgml">
 <!ENTITY chap.basics			SYSTEM "basics/chapter.sgml">
 <!ENTITY chap.ports			SYSTEM "ports/chapter.sgml">
 <!ENTITY chap.x11			SYSTEM "x11/chapter.sgml">

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.426 2011/07/08 17:29:21 bcr Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.429 2011/10/08 16:27:59 jkois Exp $
 -->
 
 <chapter id="install">
@@ -26,7 +26,7 @@
     <!-- January 2000 -->
   </chapterinfo>
 
-  <title>Installing FreeBSD</title>
+  <title>Installing &os;&nbsp;8.<replaceable>x</replaceable> and Earlier</title>
 
   <sect1 id="install-synopsis">
     <title>Synopsis</title>
@@ -34,11 +34,12 @@
     <indexterm><primary>installation</primary></indexterm>
 
     <para>FreeBSD is provided with a text-based, easy to use installation
-      program called <application>sysinstall</application>.  This is the
-      default installation program for FreeBSD, although vendors are free to
-      provide their own installation suite if they wish.  This chapter
-      describes how to use <application>sysinstall</application> to install
-      FreeBSD.</para>
+      program.  &os; 9.0-RELEASE and later use the installation program
+      known as <application>bsdinstall</application>, with releases prior
+      to 9.0-RELEASE using <application>sysinstall</application> for
+      installation.  This chapter describes the use of <application>sysinstall</application>
+      to install &os;.  The use of <application>bsdinstall</application>
+      is covered in <xref linkend="bsdinstall">.</para>
 
     <para>After reading this chapter, you will know:</para>
 
@@ -647,12 +648,6 @@
 	    <step>
 	      <title>Writing the Image with &man.dd.1;</title>
 
-	      <para>Set the <varname>kern.geom.debugflags</varname> sysctl to
-		be able to write a master boot record to the target
-		device.</para>
-
-	      <screen><userinput>&prompt.root; sysctl kern.geom.debugflags=16</userinput></screen>
-
 	      <para>The <filename>.img</filename> file
 		is <emphasis>not</emphasis> a regular file you copy to the
 		memory stick.  It is an image of the complete contents of the
@@ -661,6 +656,13 @@
 		&man.dd.1; to write the image directly to the disk:</para>
 
 	      <screen>&prompt.root; <userinput>dd if=&os;-&rel.current;-RELEASE-&arch.i386;-memstick.img of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen>
+
+	      <para>If an
+		<computeroutput>Operation not permitted</computeroutput>
+		error is displayed, make certain that the target device
+		is not in use, mounted, or being automounted by some
+		well-intentioned utility program.  Then try
+		again.</para>
 	    </step>
 	  </procedure>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#61 (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.550 2011/09/28 22:55:06 jceel Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.551 2011/10/06 14:02:25 melifaro Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -778,6 +778,8 @@
 
 <!ENTITY a.mckusick "Kirk McKusick <email>mckusick at FreeBSD.org</email>">
 
+<!ENTITY a.melifaro "Alexander V. Chernikov <email>melifaro at FreeBSD.org</email>">
+
 <!ENTITY a.mdf "Matthew Fleming <email>mdf at FreeBSD.org</email>">
 
 <!ENTITY a.mdodd "Matthew N. Dodd <email>mdodd at FreeBSD.org</email>">

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.33 2011/09/07 21:06:51 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.34 2011/10/06 22:55:11 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
      %SRCID%	1.115

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.31 2011/09/07 21:06:51 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.32 2011/10/06 22:55:11 rene Exp $
      Vertaald door: Siebrand Mazeland / Rene Ladan
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/eresources/chapter.sgml

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

@@ -1,7 +1,7 @@
 <!--
     Namen van FreeBSD mailinglijsten en gerelateerde software.
 
-    $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.29 2011/10/02 19:30:22 rene Exp $
+    $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.30 2011/10/06 22:55:11 rene Exp $
     Vertaald door: Siebrand Mazeland / Rene Ladan
 
     %SOURCE%	en_US.ISO8859-1/share/sgml/mailing-lists.ent

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#60 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.162 2011/09/28 22:55:06 jceel Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.163 2011/10/06 14:02:25 melifaro Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -276,6 +276,11 @@
       &pgpkey.ache;
     </sect2>
 
+    <sect2 id="pgpkey-melifaro">
+      <title>&a.melifaro;</title>
+      &pgpkey.melifaro;
+    </sect2>
+
     <sect2 id="pgpkey-seanc">
       <title>&a.seanc;</title>
       &pgpkey.seanc;

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#57 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.251 2011/09/28 22:55:06 jceel Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.252 2011/10/06 14:02:25 melifaro Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -218,6 +218,7 @@
 <!ENTITY pgpkey.max SYSTEM "max.key">
 <!ENTITY pgpkey.maxim SYSTEM "maxim.key">
 <!ENTITY pgpkey.mbr SYSTEM "mbr.key">
+<!ENTITY pgpkey.melifaro SYSTEM "melifaro.key">
 <!ENTITY pgpkey.metal SYSTEM "metal.key">
 <!ENTITY pgpkey.mheinen SYSTEM "mheinen.key">
 <!ENTITY pgpkey.mi SYSTEM "mi.key">

==== //depot/projects/docproj_nl/www/en/developers.sgml#63 (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.298 2011/09/28 22:52:55 jceel Exp $
+$FreeBSD: www/en/developers.sgml,v 1.299 2011/10/06 14:04:35 melifaro Exp $
 
 -->
 
@@ -391,6 +391,7 @@
 <!ENTITY a.mckusick "Kirk McKusick">
 <!ENTITY a.mdf "Matthew Fleming">
 <!ENTITY a.mdodd "Matthew N. Dodd">
+<!ENTITY a.melifaro "Alexander V. Chernikov">
 <!ENTITY a.metal "Koichi Suzuki">
 <!ENTITY a.mezz "Jeremy Messenger">
 <!ENTITY a.mharo "Michael Haro">

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

@@ -10,10 +10,38 @@
 <events>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/events2011.xml,v 1.3 2011/08/12 12:16:21 kib Exp $
+      $FreeBSD: www/share/sgml/events2011.xml,v 1.4 2011/10/10 18:52:42 brueffer Exp $
     </cvs:keyword>
   </cvs:keywords>
 
+  <event id="bsdday-argentina-2011">
+    <name>BSDday Argentina 2011</name>
+    <url>http://www.bsdday.org.ar/</url>
+    <startdate>
+      <year>2011</year>
+      <month>11</month>
+      <day>5</day>
+    </startdate>
+    <enddate>
+      <year>2011</year>
+      <month>11</month>
+      <day>5</day>
+    </enddate>
+    <location>
+      <country code="AR">Argentina</country>
+      <city>Buenos Aires City</city>
+      <site>Universidad Tecnologica Nacional</site>
+    </location>
+
+    <description>BSDday Argentina is a conference for users, sysadmins and
+      developers of BSD software and BSD based systems. The conference is for
+      anyone developing, deploying and using systems based on FreeBSD, NetBSD,
+      OpenBSD, DragonFly BSD and other BSDs.  BSDday Argentina is a technical
+      conference and aims to collect the best technical papers and presentations
+      available to ensure that the latest developments in our open source
+      community are shared with the widest possible audience.</description>
+  </event>
+
   <event id="bsdday-2011">
     <name>bsd_day(2011)</name>
     <url>http://bsdday.eu/2011</url>

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#120 (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.400 2011/09/29 02:23:15 gjb Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.401 2011/10/06 14:04:35 melifaro Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -33,6 +33,19 @@
     <name>2011</name>
 
     <month>
+      <name>10</name>
+
+      <day>
+	<name>6</name>
+
+        <event>
+          <p>New committer:
+            <a href="mailto:melifaro at FreeBSD.org">Alexander V. Chernikov</a> (src)</p>
+        </event>
+      </day>
+    </month>
+
+    <month>
       <name>9</name>
 
       <day>


More information about the p4-projects mailing list