--- xml/htdocs/doc/en/handbook/hb-net-wireless.xml	2010/11/07 20:16:49	1.19
+++ xml/htdocs/doc/en/handbook/hb-net-wireless.xml	2011/08/14 16:12:13	1.20
@@ -4,7 +4,7 @@
 <!-- The content of this document is licensed under the CC-BY-SA license -->
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-net-wireless.xml,v 1.19 2010/11/07 20:16:49 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-net-wireless.xml,v 1.20 2011/08/14 16:12:13 swift Exp $ -->
 
 <sections>
 
@@ -12,8 +12,8 @@
 Wireless configuration can be tricky. Hopefully we'll get you working!
 </abstract>
 
-<version>9.1</version>
-<date>2010-11-07</date>
+<version>10</version>
+<date>2011-08-13</date>
 
 <section>
 <title>Introduction</title>
@@ -113,7 +113,7 @@
 
 <pre caption="configure /etc/conf.d/net for wpa_supplicant">
 <comment># Prefer wpa_supplicant over wireless-tools</comment>
-modules=( "wpa_supplicant" )
+modules="wpa_supplicant"
 
 <comment># It's important that we tell wpa_supplicant which driver we should
 # be using as it's not very good at guessing yet</comment>
@@ -259,7 +259,7 @@
 
 <pre caption="sample iwconfig setup in /etc/conf.d/net">
 <comment># Prefer iwconfig over wpa_supplicant</comment>
-modules=( "iwconfig" )
+modules="iwconfig"
 
 <comment># Configure WEP keys for Access Points called ESSID1 and ESSID2</comment>
 <comment># You may configure up to 4 WEP keys, but only 1 can be active at
@@ -278,7 +278,7 @@
 
 <comment># Sometimes more than one Access Point is visible so we need to
 # define a preferred order to connect in</comment>
-preferred_aps=( "ESSID1" "ESSID2" )
+preferred_aps="'ESSID1' 'ESSID2'"
 </pre>
 
 </body>
@@ -340,7 +340,7 @@
 
 <pre caption="blacklist_aps and unique_ap example">
 <comment># Sometimes you never want to connect to certain access points</comment>
-blacklist_aps=( "ESSID3" "ESSID4" )
+blacklist_aps="'ESSID3' 'ESSID4'"
 
 <comment># If you have more than one wireless card, you can say if you want
 # to allow each card to associate with the same Access Point or not
@@ -500,24 +500,24 @@
 </impo>
 
 <pre caption="override network settings per ESSID">
-config_ESSID1=( "192.168.0.3/24 brd 192.168.0.255" )
-routes_ESSID1=( "default via 192.168.0.1" )
+config_ESSID1="192.168.0.3/24 brd 192.168.0.255"
+routes_ESSID1="default via 192.168.0.1"
 
-config_ESSID2=( "dhcp" )
-fallback_ESSID2=( "192.168.3.4/24" )
-fallback_route_ESSID2=( "default via 192.168.3.1" )
+config_ESSID2="dhcp"
+fallback_ESSID2="192.168.3.4/24"
+fallback_route_ESSID2="default via 192.168.3.1"
 
 <comment># We can define nameservers and other things too</comment>
 <comment># NOTE: DHCP will override these unless it's told not too</comment>
-dns_servers_ESSID1=( "192.168.0.1" "192.168.0.2" )
+dns_servers_ESSID1="192.168.0.1 192.168.0.2"
 dns_domain_ESSID1="some.domain"
 dns_search_domains_ESSID1="search.this.domain search.that.domain"
 
 <comment># You override by the MAC address of the Access Point
 # This handy if you goto different locations that have the same ESSID</comment>
-config_001122334455=( "dhcp" )
+config_001122334455="dhcp"
 dhcpcd_001122334455="-t 10"
-dns_servers_001122334455=( "192.168.0.1" "192.168.0.2" )
+dns_servers_001122334455="192.168.0.1 192.168.0.2"
 </pre>
 
 </body>