PERFORCE change 176256 for review

Rene Ladan rene at FreeBSD.org
Mon Mar 29 20:02:02 UTC 2010


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

Change 176256 by rene at rene_eee on 2010/03/29 20:01:51

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#53 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#20 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#26 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#45 integrate
.. //depot/projects/docproj_nl/www/en/cgi/man.cgi#13 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#28 integrate
.. //depot/projects/docproj_nl/www/en/projects/ideas/ideas.xml#9 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#21 integrate
.. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#10 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.905 2010/03/22 20:32:16 gahr Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.906 2010/03/25 07:27:28 niels Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -8457,6 +8457,11 @@
     </listitem>
 
     <listitem>
+      <para>Ryan Steinmetz
+	<email>rpsfa at rit.edu</email></para>
+    </listitem>
+
+    <listitem>
       <para>Ryan T. Dean
 	<email>rtdean at cytherianage.net</email></para>
     </listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.426 2010/01/13 08:29:29 delphij Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.428 2010/03/28 18:38:58 pgj Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -821,8 +821,13 @@
 	  <para>In the rest of this document, we will use an
 	    &man.ath.4; device, the device name in the examples must
 	    be changed according to your configuration.  A list of
-	    available wireless drivers can be found at the beginning
-	    of the &man.wlan.4; manual page.  If a native &os; driver
+	    available wireless drivers and supported adapters can be
+	    found in the &os; Hardware Notes.  Copies of these notes
+	    for various releases and architectures are available on
+	    the <ulink
+	    url="http://www.FreeBSD.org/releases/index.html">Release
+	    Information</ulink> page of the &os; Web site.
+	    If a native &os; driver
 	    for your wireless device does not exist, it may be
 	    possible to directly use the &windows; driver with the
 	    help of the <link
@@ -830,7 +835,7 @@
 	    wrapper.</para>
 	</note>
 
-	<para>With a device driver configured you need to also bring
+	<para>Under &os;&nbsp;7.X, with a device driver you need to also bring
 	  in the 802.11 networking support required by the driver.
 	  For the &man.ath.4; driver these are at least the &man.wlan.4;,
 	  <literal>wlan_scan_ap</literal> and
@@ -843,12 +848,9 @@
 	<programlisting>wlan_scan_ap_load="YES"
 wlan_scan_sta_load="YES"</programlisting>
 
-	<note>
-	  <para>Both <literal>wlan_scan_ap</literal> and
-	    <literal>wlan_scan_sta</literal> modules are required by
-	    &os;&nbsp;7.X, other &os; versions do not need
-	    them.</para>
-	</note>
+	<para>Since &os;&nbsp;8.0, these modules are part of the
+	  base &man.wlan.4; driver which is dynamically loaded with
+	  the adapter driver.</para>
 
 	<para>With that you will need the modules
 	  that implement cryptographic support for the security
@@ -880,21 +882,22 @@
 	    compile these drivers into the kernel by adding the
 	    following lines to your kernel configuration file:</para>
 
-	  <programlisting>device ath               # Atheros IEEE 802.11 wireless network driver
-device ath_hal           # Atheros Hardware Access Layer
-options AH_SUPPORT_AR5416       # enable AR5416 tx/rx descriptors
-device ath_rate_sample   # SampleRate tx rate control for ath
-device wlan              # 802.11 support
-device wlan_scan_ap      # 802.11 AP mode scanning
-device wlan_scan_sta     # 802.11 STA mode scanning
+	  <programlisting>device wlan              # 802.11 support
 device wlan_wep          # 802.11 WEP support
 device wlan_ccmp         # 802.11 CCMP support
-device wlan_tkip         # 802.11 TKIP support</programlisting>
+device wlan_tkip         # 802.11 TKIP support
+device wlan_amrr         # AMRR transmit rate control algorithm
+device ath               # Atheros pci/cardbus NIC's
+device ath_hal           # pci/cardbus chip support
+options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
+device ath_rate_sample   # SampleRate tx rate control for ath</programlisting>
 
-	  <para>Both <literal>wlan_scan_ap</literal> and
-	    <literal>wlan_scan_sta</literal> lines are required by
+	  <para>Both following lines are also required by
 	    &os;&nbsp;7.X, other &os; versions do not need
-	    them.</para>
+	    them:</para>
+
+	  <programlisting>device wlan_scan_ap      # 802.11 AP mode scanning
+device wlan_scan_sta     # 802.11 STA mode scanning</programlisting>
 
 	  <para>With this information in the kernel configuration
 	    file, recompile the kernel and reboot your &os;
@@ -934,10 +937,11 @@
 	    probes for available access points.  Only the super-user
 	    can initiate such a scan:</para>
 
-	  <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput>
+	  <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
 SSID            BSSID              CHAN RATE  S:N   INT CAPS
-dlinkap         00:13:46:49:41:76    6   54M 29:3   100 EPS  WPA WME
-freebsdap       00:11:95:c3:0d:ac    1   54M 22:1   100 EPS  WPA</screen>
+dlinkap         00:13:46:49:41:76   11   54M -90:96   100 EPS  WPA WME
+freebsdap       00:11:95:c3:0d:ac    1   54M -83:96   100 EPS  WPA</screen>
 
 	  <note>
 	    <para>You must mark the interface <option>up</option>
@@ -945,6 +949,21 @@
 	      require you to mark the interface up again.</para>
 	  </note>
 
+	  <note>
+	    <para>Under &os;&nbsp;7.X, the adapter device, for example
+	      <devicename><replaceable>ath0</replaceable></devicename>,
+	      is used directly instead of the
+	      <devicename>wlan<replaceable>0</replaceable></devicename>
+	      device.  This requires you to replace the both previous
+	      lines with:</para>
+
+	    <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput></screen>
+
+	    <para>In the rest of this document, the &os;&nbsp;7.X user
+	      will have to change the command and configuration lines
+	      according to that scheme.</para>
+	  </note>
+
 	  <para>The output of a scan request lists each BSS/IBSS
 	    network found.  Beside the name of the network,
 	    <literal>SSID</literal>, we find the
@@ -1013,7 +1032,7 @@
 	  <para>One can also display the current list of known
 	    networks with:</para>
 
-	  <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> list scan</userinput></screen>
+	  <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> list scan</userinput></screen>
 
 	  <para>This information may be updated automatically by the
 	    adapter or manually with a <option>scan</option> request.
@@ -1046,13 +1065,22 @@
 	      up or otherwise configure an interface by listing it in
 	      <filename>/etc/rc.conf</filename>, e.g.:</para>
 
-	    <programlisting>ifconfig_ath0="DHCP"</programlisting>
+	    <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="DHCP"</programlisting>
+
+	    <note>
+	      <para>As previously mentioned, &os;&nbsp;7.X will only
+		require a line related to the adapter device:</para>
+
+	      <programlisting>ifconfig_ath0="DHCP"</programlisting>
+	    </note>
 
 	    <para>If there are multiple access points and you want to
 	      select a specific one, you can select it by its
 	      SSID:</para>
 
-	    <programlisting>ifconfig_ath0="ssid <replaceable>your_ssid_here</replaceable> DHCP"</programlisting>
+	    <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="ssid <replaceable>your_ssid_here</replaceable> DHCP"</programlisting>
 
 	    <para>In an environment where there are multiple access
 	      points with the same SSID (often done to simplify
@@ -1061,7 +1089,8 @@
 	      BSSID of the access point (you can also leave off the
 	      SSID):</para>
 
-	    <programlisting>ifconfig_ath0="ssid <replaceable>your_ssid_here</replaceable> bssid <replaceable>xx:xx:xx:xx:xx:xx</replaceable> DHCP"</programlisting>
+	    <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="ssid <replaceable>your_ssid_here</replaceable> bssid <replaceable>xx:xx:xx:xx:xx:xx</replaceable> DHCP"</programlisting>
 
 	    <para>There are other ways to constrain the choice of an
 	      access point such as limiting the set of frequencies the
@@ -1071,7 +1100,8 @@
 	      specific band you can use the <option>mode</option>
 	      parameter; e.g.:</para>
 
-	    <programlisting>ifconfig_ath0="mode <replaceable>11g</replaceable> ssid <replaceable>your_ssid_here</replaceable> DHCP"</programlisting>
+	    <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="mode <replaceable>11g</replaceable> ssid <replaceable>your_ssid_here</replaceable> DHCP"</programlisting>
 
 	    <para>will force the card to operate in 802.11g which is
 	      defined only for 2.4GHz frequencies so any 5GHz channels
@@ -1113,7 +1143,8 @@
 		&airport; base station you can setup access with
 		something like:</para>
 
-	      <programlisting>ifconfig_ath0="authmode shared wepmode on weptxkey <replaceable>1</replaceable> wepkey <replaceable>01234567</replaceable> DHCP"</programlisting>
+	      <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="authmode shared wepmode on weptxkey <replaceable>1</replaceable> wepkey <replaceable>01234567</replaceable> DHCP"</programlisting>
 
 	      <para>In general shared key authentication is to be
 		avoided because it uses the WEP key material in a
@@ -1137,7 +1168,8 @@
 	      <literal>DHCP</literal> to the configuration for your
 	      device as shown in various examples above:</para>
 
-	    <programlisting>ifconfig_ath0="DHCP"</programlisting>
+	    <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="DHCP"</programlisting>
 
 	    <para>At this point, you are ready to bring up the
 	      wireless interface:</para>
@@ -1148,24 +1180,24 @@
 	      <command>ifconfig</command> to see the status of the
 	      interface <devicename>ath0</devicename>:</para>
 
-	    <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
-ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
-        inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+	    <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+        ether 00:11:95:d5:43:62
         inet 192.168.1.100 netmask 0xffffff00 broadcast 192.168.1.255
-        ether 00:11:95:d5:43:62
-        media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/54Mbps)
+        media: IEEE 802.11 Wireless Ethernet OFDM/54Mbps mode 11g
         status: associated
-        ssid dlinkap channel 6 bssid 00:13:46:49:41:76
-        authmode OPEN privacy OFF txpowmax 36 protmode CTS bintval 100</screen>
+        ssid dlinkap channel 11 (2462 Mhz 11g) bssid 00:13:46:49:41:76
+        country US ecm authmode OPEN privacy OFF txpower 21.5 bmiss 7
+        scanvalid 60 bgscan bgscanintvl 300 bgscanidle 250 roam:rssi 7
+        roam:rate 5 protmode CTS wme burst</screen>
 
 	    <para>The <literal>status: associated</literal> means you
 	      are connected to the wireless network (to the
 	      <literal>dlinkap</literal> network in our case).  The
 	      <literal>bssid 00:13:46:49:41:76</literal> part is the
 	      MAC address of your access point; the
-	      <literal>authmode</literal> line informs you that the
-	      communication is not encrypted
-	      (<literal>OPEN</literal>).</para>
+	      <literal>authmode OPEN</literal> part informs you that the
+	      communication is not encrypted.</para>
 	  </sect5>
 
 	  <sect5>
@@ -1178,7 +1210,8 @@
 	      parameters you have set up for selecting an access
 	      point:</para>
 
-	    <programlisting>ifconfig_ath0="ssid <replaceable>your_ssid_here</replaceable> inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable>"</programlisting>
+	    <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="ssid <replaceable>your_ssid_here</replaceable> inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable>"</programlisting>
 	  </sect5>
 	</sect4>
 
@@ -1253,60 +1286,64 @@
 	      done with WPA and the IP address will be obtained with
 	      DHCP:</para>
 
-	    <programlisting>ifconfig_ath0="WPA DHCP"</programlisting>
+	    <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"</programlisting>
 
 	    <para>Then, we can bring up the interface:</para>
 
 	    <screen>&prompt.root; <userinput><filename>/etc/rc.d/netif</filename> start</userinput>
 Starting wpa_supplicant.
-DHCPDISCOVER on ath0 to 255.255.255.255 port 67 interval 5
-DHCPDISCOVER on ath0 to 255.255.255.255 port 67 interval 6
+DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 5
+DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 6
 DHCPOFFER from 192.168.0.1
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
 DHCPACK from 192.168.0.1
 bound to 192.168.0.254 -- renewal in 300 seconds.
-ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/36Mbps)
+      media: IEEE 802.11 Wireless Ethernet OFDM/36Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36
-      protmode CTS roaming MANUAL bintval 100</screen>
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL</screen>
 
 	    <para>Or you can try to configure it manually using the
 	      same <filename>/etc/wpa_supplicant.conf</filename> <link
 	      linkend="network-wireless-wpa-wpa-psk">above</link>, and
 	      run:</para>
 
-	    <screen>&prompt.root; <userinput>wpa_supplicant -i <replaceable>ath0</replaceable> -c /etc/wpa_supplicant.conf</userinput>
+	    <screen>&prompt.root; <userinput>wpa_supplicant -i <replaceable>wlan0</replaceable> -c /etc/wpa_supplicant.conf</userinput>
 Trying to associate with 00:11:95:c3:0d:ac (SSID='freebsdap' freq=2412 MHz)
 Associated with 00:11:95:c3:0d:ac
-WPA: Key negotiation completed with 00:11:95:c3:0d:ac [PTK=TKIP GTK=TKIP]</screen>
+WPA: Key negotiation completed with 00:11:95:c3:0d:ac [PTK=CCMP GTK=CCMP]
+CTRL-EVENT-CONNECTED - Connection to 00:11:95:c3:0d:ac completed (auth) [id=0 id_str=]</screen>
 
 	    <para>The next operation is the launch of the
 	      <command>dhclient</command> command to get the IP
 	      address from the DHCP server:</para>
 
-	    <screen>&prompt.root; <userinput>dhclient <replaceable>ath0</replaceable></userinput>
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+	    <screen>&prompt.root; <userinput>dhclient <replaceable>wlan0</replaceable></userinput>
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67
 DHCPACK from 192.168.0.1
 bound to 192.168.0.254 -- renewal in 300 seconds.
-&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
-ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/48Mbps)
+      media: IEEE 802.11 Wireless Ethernet OFDM/36Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36
-      protmode CTS roaming MANUAL bintval 100</screen>
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL</screen>
 
 	    <note>
 	      <para>If the <filename>/etc/rc.conf</filename> is set up
-		with the line <literal>ifconfig_ath0="DHCP"</literal>
+		with the line <literal>ifconfig_wlan0="DHCP"</literal>
 		then it is no need to run the
 		<command>dhclient</command> command manually,
 		<command>dhclient</command> will be launched after
@@ -1319,17 +1356,18 @@
 	      <command>wpa_supplicant</command> has authenticated the
 	      station:</para>
 
-	    <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> inet <replaceable>192.168.0.100</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
-&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
-ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+	    <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.100</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.100 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/36Mbps)
+      media: IEEE 802.11 Wireless Ethernet OFDM/36Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36
-      protmode CTS roaming MANUAL bintval 100</screen>
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL</screen>
 
 	    <para>When DHCP is not used, you also have to manually set
 	      up the default gateway and the nameserver:</para>
@@ -1437,29 +1475,31 @@
 	      </callout>
 	    </calloutlist>
 
-	    <para>Then add the following line to
+	    <para>Then add the following lines to
 	      <filename>/etc/rc.conf</filename>:</para>
 
-	    <programlisting>ifconfig_ath0="WPA DHCP"</programlisting>
+	    <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"</programlisting>
 
 	    <para>The next step is to bring up the interface with the
 	      help of the <filename>rc.d</filename> facility:</para>
 
 	    <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
 Starting wpa_supplicant.
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
 DHCPACK from 192.168.0.20
 bound to 192.168.0.254 -- renewal in 300 seconds.
-ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps)
+      media: IEEE 802.11 Wireless Ethernet DS/11Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit
-      txpowmax 36 protmode CTS roaming MANUAL bintval 100</screen>
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL</screen>
 
 	    <para>As previously shown, it is also possible to bring up
 	      the interface manually with both
@@ -1527,29 +1567,31 @@
 	      </callout>
 	    </calloutlist>
 
-	    <para>You also have to add the following line to
+	    <para>You also have to add the following lines to
 	      <filename>/etc/rc.conf</filename>:</para>
 
-	    <programlisting>ifconfig_ath0="WPA DHCP"</programlisting>
+	    <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"</programlisting>
 
 	    <para>The next step is to bring up the interface:</para>
 
 	    <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
 Starting wpa_supplicant.
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 21
 DHCPACK from 192.168.0.20
 bound to 192.168.0.254 -- renewal in 300 seconds.
-ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps)
+      media: IEEE 802.11 Wireless Ethernet DS/11Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit
-      txpowmax 36 protmode CTS roaming MANUAL bintval 100</screen>
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL</screen>
 	  </sect5>
 
 	  <sect5 id="network-wireless-wpa-eap-peap">
@@ -1637,26 +1679,28 @@
 	    <para>The following must be added to
 	      <filename>/etc/rc.conf</filename>:</para>
 
-	    <programlisting>ifconfig_ath0="WPA DHCP"</programlisting>
+	    <programlisting>wlans_ath0="wlan0"
+ifconfig_wlan0="WPA DHCP"</programlisting>
 
 	    <para>Then, we can bring up the interface:</para>
 
 	    <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
 Starting wpa_supplicant.
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
-DHCPREQUEST on ath0 to 255.255.255.255 port 67
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
+DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 21
 DHCPACK from 192.168.0.20
 bound to 192.168.0.254 -- renewal in 300 seconds.
-ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
-      inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+      ether 00:11:95:d5:43:62
       inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255
-      ether 00:11:95:d5:43:62
-      media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps)
+      media: IEEE 802.11 Wireless Ethernet DS/11Mbps mode 11g
       status: associated
-      ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
-      authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit
-      txpowmax 36 protmode CTS roaming MANUAL bintval 100</screen>
+      ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+      country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF
+      AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan
+      bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS
+      wme burst roaming MANUAL</screen>
 	  </sect5>
 	</sect4>
 
@@ -1671,7 +1715,8 @@
 	  <para>WEP can be set up with
 	    <command>ifconfig</command>:</para>
 
-	  <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> ssid my_net wepmode on weptxkey 3 wepkey 3:0x3456789012 \
+	  <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> ssid my_net wepmode on weptxkey 3 wepkey 3:0x3456789012 \
 	    inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput></screen>
 
 	  <itemizedlist>
@@ -1719,7 +1764,7 @@
 
 	  <para>Then:</para>
 
-	  <screen>&prompt.root; <userinput>wpa_supplicant -i <replaceable>ath0</replaceable> -c /etc/wpa_supplicant.conf</userinput>
+	  <screen>&prompt.root; <userinput>wpa_supplicant -i <replaceable>wlan0</replaceable> -c /etc/wpa_supplicant.conf</userinput>
 Trying to associate with 00:13:46:49:41:76 (SSID='dlinkap' freq=2437 MHz)
 Associated with 00:13:46:49:41:76</screen>
 	</sect4>
@@ -1737,12 +1782,12 @@
 
       <para>On the box <hostid>A</hostid>:</para>
 
-      <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> ssid <replaceable>freebsdap</replaceable> mediaopt adhoc inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
-&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
-  ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+      <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> ssid <replaceable>freebsdap</replaceable> mediaopt adhoc inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
+  wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+	  ether 00:11:95:c3:0d:ac
 	  inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
-	  inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4
-	  ether 00:11:95:c3:0d:ac
 	  media: IEEE 802.11 Wireless Ethernet autoselect &lt;adhoc&gt; (autoselect &lt;adhoc&gt;)
 	  status: associated
 	  ssid freebsdap channel 2 bssid 02:11:95:c3:0d:ac
@@ -1754,21 +1799,21 @@
       <para>On <hostid>B</hostid>, we should be able to detect
 	<hostid>A</hostid>:</para>
 
-      <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput>
+      <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
   SSID            BSSID              CHAN RATE  S:N   INT CAPS
-  freebsdap       02:11:95:c3:0d:ac    2   54M 19:3   100 IS</screen>
+  freebsdap       02:11:95:c3:0d:ac    2   54M -90:-96   100 IS</screen>
 
       <para>The <literal>I</literal> in the output confirms the
 	machine <hostid>A</hostid> is in ad-hoc mode.  We just have to
 	configure <hostid>B</hostid> with a different IP
 	address:</para>
 
-      <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> ssid <replaceable>freebsdap</replaceable> mediaopt adhoc inet <replaceable>192.168.0.2</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
-&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
-  ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
-	  inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+      <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> ssid <replaceable>freebsdap</replaceable> mediaopt adhoc inet <replaceable>192.168.0.2</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
+  wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
+	  ether 00:11:95:d5:43:62
 	  inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255
-	  ether 00:11:95:d5:43:62
 	  media: IEEE 802.11 Wireless Ethernet autoselect &lt;adhoc&gt; (autoselect &lt;adhoc&gt;)
 	  status: associated
 	  ssid freebsdap channel 2 bssid 02:11:95:c3:0d:ac

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.478 2010/03/23 18:45:35 hrs Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.479 2010/03/25 23:58:10 delphij Exp $
 -->
 
 <appendix id="mirrors">
@@ -892,10 +892,7 @@
 	  system.  Older &os; versions do not have &man.csup.1; in their
 	  base system but you can easily install the
 	  <filename role="package">net/csup</filename> port, or a precompiled
-	  package.  The <application>csup</application> utility does not
-	  support CVS mode, though.  If you want to mirror complete
-	  repositories, you will still need to use
-	  <application>CVSup</application>.  If you decided to use
+	  package.  If you decided to use
 	  <application>csup</application>, just skip the steps on the
 	  installation of <application>CVSup</application> and
 	  substitute the references of <application>CVSup</application> with

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.34 2010/02/13 15:53:43 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.35 2010/03/24 21:22:17 rene Exp $
      Vertaald door: Siebrand Mazeland / Rene Ladan
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml

==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#13 (text+ko) ====

@@ -34,7 +34,7 @@
 # Dual CGI/Plexus mode and new interface by sanders at bsdi.com 9/22/1995
 #
 # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $
-# $FreeBSD: www/en/cgi/man.cgi,v 1.243 2010/03/23 17:55:05 hrs Exp $
+# $FreeBSD: www/en/cgi/man.cgi,v 1.244 2010/03/26 02:44:48 hrs Exp $
 
 ############################################################################
 # !!! man.cgi is stale perl4 code !!!
@@ -206,7 +206,7 @@
     'FreeBSD 8.0-RELEASE', "$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-8.0-RELEASE/openssl/man",
     'FreeBSD 8.0-stable', "$manLocalDir/FreeBSD-8.0-stable/man:$manLocalDir/FreeBSD-8.0-stable/openssl/man",
 
-    'FreeBSD 7.3-stable', "$manLocalDir/FreeBSD-7.3-stable",
+    'FreeBSD 7.3-stable', "$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man",
     'FreeBSD 7.3-RELEASE', "$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man",
     'FreeBSD 7.2-stable', "$manLocalDir/FreeBSD-7.2-stable",
     'FreeBSD 7.2-RELEASE', "$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man",
@@ -1431,7 +1431,7 @@
     }
 
     local $id =
-      '$FreeBSD: www/en/cgi/man.cgi,v 1.243 2010/03/23 17:55:05 hrs Exp $';
+      '$FreeBSD: www/en/cgi/man.cgi,v 1.244 2010/03/26 02:44:48 hrs Exp $';
     return qq{\
 <pre>
 Copyright (c) 1996-2010 <a href="$mailtoURL">Wolfram Schneider</a>

==== //depot/projects/docproj_nl/www/en/donations/donors.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/donors.sgml,v 1.406 2010/03/03 13:21:45 gahr Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.408 2010/03/29 07:36:56 gahr Exp $">
 <!ENTITY title "Hardware Donors Page">
 <!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
@@ -2701,6 +2701,21 @@
     <td> Received </td>
   </tr>
 
+  <tr>
+    <td> sson </td>
+    <td> PowerMac G4 </td>
+    <td> stas </td>
+    <td> Received </td>
+  </tr>
+
+  <tr>
+    <td> sson </td>
+    <td> PowerMac G4 </td>
+    <td> rnoland </td>
+    <td> Received </td>
+  </tr>
+
+
 </table>
 
 &footer;

==== //depot/projects/docproj_nl/www/en/projects/ideas/ideas.xml#9 (text+ko) ====

@@ -15,7 +15,7 @@
 <ideas>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.158 2010/03/22 16:36:20 erwin Exp $
+      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.160 2010/03/28 16:25:50 rwatson Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -596,6 +596,7 @@
 
 	<desc>
 <p><strong>Technical contact</strong>: <a
+  href="mailto:sson at FreeBSD.org">Stacey Son</a>, <a
   href="mailto:rwatson at FreeBSD.org">Robert Watson</a></p>
 <p><strong>URL</strong>: <a
   href="http://perforce.freebsd.org/depotTreeBrowser.cgi?FSPC=//depot/projects/dtrace">Perforce
@@ -1015,7 +1016,7 @@
   href="http://www.freebsd.org/cgi/cvsweb.cgi/projects/csup/">CVSweb</a>
   </p>
 <p>csup is a port of the cvsup high-speed CVS repository replication
-  application from the original Modula-3 to the C lanaguage.  It is now
+  application from the original Modula-3 to the C language.  It is now
   distributed with FreeBSD, but is missing some important features that would
   make useful projects to work on:</p>
 <ul>

==== //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#21 (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.109 2010/03/09 22:18:46 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.113 2010/03/28 12:02:35 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.109 2010/03/09 22:18:46 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.113 2010/03/28 12:02:35 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -540,6 +540,18 @@
     </description>
   </entry>
 
+  <entry id="OKTS" category="namerica">
+    <name>Okanagan Technology Solutions</name>
+    <url>http://www.okts.ca/</url>
+    <description>
+      Okanagan Technology Solutions specializes in open source
+      technologies, in particular FreeBSD, Perl, Apache, and MySQL for
+      clients in the beautiful Okanagan region of British Columbia.
+      For more information, please visit our <a
+      href="http://www.okts.ca">web site</a>.
+    </description>
+  </entry>
+
   <entry id="LNC" category="namerica">
     <name>Linux Network Care</name>
     <url>http://www.linuxnetworkcare.com/</url>
@@ -650,21 +662,6 @@
     </description>
   </entry>
 
-  <entry id="Neturn" category="namerica">
-    <name>Neturn Corp.</name>
-    <url>http://neturn.sinacity.com/netserv/</url>
-    <description>
-      Neturn Corp., based in Vancouver, Canada, provides complete solutions
-      on selective and fine-tuned hardware and software (BSDs as primary
-      server OSs) platforms to meet the <b>demand from e-commerce,
-      telecom, manufacturing, industrial, aerospace, medical applications
-      where stability and reliability are mandatory</b>. For detailed
-      information, please visit <a
-      href="http://neturn.sinacity.com/netserv/">http://neturn.sinacity.com
-      /netserv</a>.
-    </description>
-  </entry>
-
   <entry id="Netgraft" category="namerica">
     <name>Netgraft Corp.</name>
     <url>http://netgraft.com/</url>
@@ -1200,8 +1197,8 @@
     <description>
       Raditex AB are a firm of consultants and also do education in Unix.
       We have long experience with all kinds of Unix systems not only
-      FreeBSD or Linux. For more information phone us at +46.8.6949270 or
-      give us an email at <a
+      FreeBSD or Linux. For more information phone us at +46 19 4501015
+      or give us an email at <a
       href="mailto:gorhas at raditex.nu">gorhas at raditex.nu</a> or <a
       href="http://raditex.nu/">visit our web site</a>.
     </description>

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

@@ -5,7 +5,7 @@
 <usergroups>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/usergroups.xml,v 1.83 2010/01/21 21:48:07 jkois Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.84 2010/03/28 17:59:39 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -519,18 +519,6 @@
     </entry>
   </country>
 
-
-  <country code="CH" name="Switzerland">
-    <entry id="swissbug" >
-      <name>Swiss BSD User Group (SwissBUG)</name>
-      <url>http://www.swissbug.org</url>
-
-      <description>The Swiss BSD User Group (SwissBUG) caters for
-        users of BSD-based systems in Switzerland. Located in
-        Switzerland.
-      </description>
-    </entry>
-  </country>
   <country code="UA" name="Ukraine">
     <entry id="uafug" >
       <name>Ukrainian FreeBSD User Group (UAFUG)</name>


More information about the p4-projects mailing list