Date: Sun, 2 Oct 2011 17:05:03 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 199617 for review Message-ID: <201110021705.p92H53Zk086341@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@199617?ac=10 Change 199617 by rene@rene_acer on 2011/10/02 17:04:32 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#106 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#31 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#28 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#45 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#106 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1022 2011/09/24 17:20:57 pawel Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1024 2011/10/02 14:59:50 pawel Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -968,6 +968,11 @@ </listitem> <listitem> + <para>Anton Hryciuk + <email>gnixua@gmail.com</email></para> + </listitem> + + <listitem> <para>Anton N. Bruesov <email>antonz@library.ntu-kpi.kiev.ua</email></para> </listitem> @@ -6882,6 +6887,11 @@ </listitem> <listitem> + <para>Mikhail T. + <email>michael@fun-box.ru</email></para> + </listitem> + + <listitem> <para>Mikhail Zakharov <email>zmey20000@yahoo.com</email></para> </listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#31 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.438 2011/09/29 16:13:04 brd Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.439 2011/10/02 05:37:39 brd Exp $ --> <chapter id="advanced-networking"> @@ -3377,12 +3377,14 @@ channel-group <replaceable>1</replaceable> mode active channel-protocol lacp</userinput></screen> - <para>On the &os; machine create the &man.lagg.4; interface using - <replaceable>fxp0</replaceable> and - <replaceable>fxp1</replaceable>, with an IP Address of + <para>Create the &man.lagg.4; interface using + <replaceable>fxp0</replaceable> and <replaceable>fxp1</replaceable>, + and bring the interfaces up with the IP Address of <replaceable>10.0.0.3/24</replaceable>:</para> - <screen>&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> create </userinput> + <screen>&prompt.root; <userinput>ifconfig <replaceable>fxp0</replaceable> up</userinput> +&prompt.root; <userinput>ifconfig <replaceable>fxp1</replaceable> up</userinput> +&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> create </userinput> &prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> up laggproto lacp laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable> <replaceable>10.0.0.3/24</replaceable></userinput></screen> <para>View the interface status by running:</para> @@ -3437,14 +3439,15 @@ <title>Failover mode</title> <para>Failover mode can be used to switch over to a secondary interface if - the link is lost on the master interface. Create and configure the - <literal>lagg<replaceable>0</replaceable></literal> interface, with + the link is lost on the master interface. Bring the underlying + physical interfaces up. Create the &man.lagg.4; interface, using <replaceable>fxp0</replaceable> as the master interface and - <replaceable>fxp1</replaceable> as the secondary interface, - with an IP Address of <replaceable>10.0.0.15/24</replaceable>: - </para> + <replaceable>fxp1</replaceable> as the secondary interface and assign + an IP Address of <replaceable>10.0.0.15/24</replaceable>:</para> - <screen>&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> create</userinput> + <screen>&prompt.root; <userinput>ifconfig <replaceable>fxp0</replaceable> up</userinput> +&prompt.root; <userinput>ifconfig <replaceable>fxp1</replaceable> up</userinput> +&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> create</userinput> &prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> up laggproto failover laggport <replaceable>fxp0</replaceable> laggport <replaceable>fxp1</replaceable> <replaceable>10.0.0.15/24</replaceable></userinput></screen> <para>The interface will look something like this, the major @@ -3523,11 +3526,13 @@ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>iwn0</replaceable> ssid <replaceable>my_router</replaceable> up</userinput></screen> - <para>Create the &man.lagg.4; interface with <replaceable>bge0</replaceable> + <para>Bring the <replaceable>bge0</replaceable> interface up. Create + the &man.lagg.4; interface with <replaceable>bge0</replaceable> as master, and failover to <replaceable>wlan0</replaceable> if necessary:</para> - <screen>&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> create</userinput> + <screen>&prompt.root; <userinput>ifconfig <replaceable>bge0</replaceable> up</userinput> +&prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> create</userinput> &prompt.root; <userinput>ifconfig <literal>lagg<replaceable>0</replaceable></literal> up laggproto failover laggport <replaceable>bge0</replaceable> laggport <replaceable>wlan0</replaceable></userinput></screen> <para>The interface will look something like this, the major ==== //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#28 (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/donations/wantlist.sgml,v 1.503 2011/06/10 21:13:34 gjb Exp $"> +<!ENTITY date "$FreeBSD: www/en/donations/wantlist.sgml,v 1.504 2011/10/02 12:32:11 des Exp $"> <!ENTITY title "FreeBSD Developers Want List"> <!ENTITY email 'donations'> <!ENTITY % navinclude.about "INCLUDE"> @@ -52,9 +52,11 @@ <tr> <td>des</td> <td>Norway</td> - <td>Mac Mini with 1 GB RAM, no peripherals</td> - <td>Tinderbox.</td> - <td>2005/05/19</td> + <td>1 GB memory sticks: 184-pin DDR SDRAM, ECC + REG, + PC2100 CL 2.5. Up to 20 (two each for 10 scavenged 1U + servers).</td> + <td>Test cluster.</td> + <td>2011/10/02</td> </tr> <tr> ==== //depot/projects/docproj_nl/www/en/releng/index.sgml#45 (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/releng/index.sgml,v 1.295 2011/08/05 02:25:21 hrs Exp $"> +<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.296 2011/10/02 12:41:04 delphij Exp $"> <!ENTITY email 're'> <!ENTITY title "Release Engineering Information"> <!ENTITY % navinclude.developers "INCLUDE"> @@ -87,14 +87,30 @@ <tr> <td><tt>HEAD</tt></td> - <td>Frozen</td> + <td>Slush</td> <td>committers</td> + <td>Active development branch for 10-CURRENT. Avoid major + changes before 9.0-RELEASE.</td> + </tr> - <td>Active development branch for 9-CURRENT and now in a + <tr> + <td><tt>RELENG_9</tt></td> + <td>Frozen</td> + <td>&contact.re;</td> + <td>Development branch for FreeBSD 9-STABLE, and now in a preparation stage for 9.0-RELEASE. All commits to this branch requires RE's approval.</td> </tr> +<!-- + <tr> + <td><tt>RELENG_9_0</tt></td> + <td>Frozen</td> + <td>&contact.re;</td> + <td>FreeBSD 9.0 release branch.</td> + </tr> +--> + <tr> <td><tt>RELENG_8</tt></td> <td>Open</td>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110021705.p92H53Zk086341>