Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 May 2012 19:21:21 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 210799 for review
Message-ID:  <201205071921.q47JLLZ2066990@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@210799?ac=10

Change 210799 by rene@rene_acer on 2012/05/07 19:21:16

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#140 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#12 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#34 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#64 integrate
.. //depot/projects/docproj_nl/www/en/news/status/report-2012-01-2012-03.xml#1 branch
.. //depot/projects/docproj_nl/www/en/releng/dst_info.sgml#3 branch
.. //depot/projects/docproj_nl/www/share/sgml/press.xml#25 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1086 2012/04/30 19:01:02 lwhsu Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1087 2012/05/06 10:02:34 madpilot Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -7532,6 +7532,11 @@
 
     <listitem>
       <para>No Name
+	<email>nemysis@gmx.ch</email></para>
+    </listitem>
+
+    <listitem>
+      <para>No Name
 	<email>ohki@gssm.otsuka.tsukuba.ac.jp</email></para>
     </listitem>
 

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml,v 1.146 2012/02/21 00:08:43 eadler Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml,v 1.147 2012/05/05 15:37:46 bcr Exp $
 -->
 
 <chapter id="mail">
@@ -782,7 +782,7 @@
 	find something like the following
 	in <filename>/etc/mail/mailer.conf</filename>:</para>
 
-<programlisting>sendmail	 /usr/libexec/sendmail/sendmail
+<programlisting>sendmail	/usr/libexec/sendmail/sendmail
 send-mail	/usr/libexec/sendmail/sendmail
 mailq		/usr/libexec/sendmail/sendmail
 newaliases	/usr/libexec/sendmail/sendmail
@@ -803,7 +803,7 @@
 	to be run instead of <application>sendmail</application>, you could change
 	<filename>/etc/mail/mailer.conf</filename> to read:</para>
 
-<programlisting>sendmail	 /usr/local/supermailer/bin/sendmail-compat
+<programlisting>sendmail	/usr/local/supermailer/bin/sendmail-compat
 send-mail	/usr/local/supermailer/bin/sendmail-compat
 mailq		/usr/local/supermailer/bin/mailq-compat
 newaliases	/usr/local/supermailer/bin/newaliases-compat

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.143 2012/02/05 06:40:54 gjb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.144 2012/05/05 15:39:46 eadler Exp $
 -->
 
 <chapter id="network-servers">
@@ -2773,7 +2773,7 @@
 	</listitem>
 
 	<listitem>
-	  <para><filename>/var/db/dhclient.leases</filename></para>
+	  <para><filename>/var/db/dhclient.leases.<replaceable>interface</replaceable></filename></para>
 	  <para>The DHCP client keeps a database of valid leases in
 	    this file, which is written as a log.
 	    &man.dhclient.leases.5; gives a slightly longer

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.43 2012/04/15 10:36:30 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.44 2012/05/05 09:55:38 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
      %SRCID%	1.130

==== //depot/projects/docproj_nl/www/share/sgml/press.xml#25 (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.100 2012/04/24 02:59:50 eadler Exp $
+      $FreeBSD: www/share/sgml/press.xml,v 1.101 2012/05/07 02:22:32 gjb Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -21,7 +21,7 @@
 
       <story>
 	<name>FreeBSD Gets A New X.Org With Intel KMS</name>
-	<url>http://www.phoronix.com/scan.php?page=news_item&amp;px=MTA5MT</url>;
+	<url>http://www.phoronix.com/scan.php?page=news_item&amp;px=MTA5MTc</url>;
 	<site-name>phoronix</site-name>
 	<site-url>http://www.phoronix.com</site-url>;
 	<date>23 April 2012</date>



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