summaryrefslogtreecommitdiffstats
path: root/doc/wireless-dbus
diff options
context:
space:
mode:
authorJames Rayner <james@archlinux.org>2009-08-10 08:09:16 +0200
committerJames Rayner <james@archlinux.org>2009-08-10 08:09:16 +0200
commit9a3078d8cec470b3820c5597d5c8819d642e558d (patch)
tree7287f79ad908eb8cd6352b19c3e59e6bc57e4c94 /doc/wireless-dbus
parent280b25e1171a4609356e888066614a4dc2ecb678 (diff)
downloadnetctl-9a3078d8cec470b3820c5597d5c8819d642e558d.tar.gz
netctl-9a3078d8cec470b3820c5597d5c8819d642e558d.tar.xz
revert pryor patch
Diffstat (limited to 'doc/wireless-dbus')
-rw-r--r--doc/wireless-dbus6
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/wireless-dbus b/doc/wireless-dbus
index bddd565..918256d 100644
--- a/doc/wireless-dbus
+++ b/doc/wireless-dbus
@@ -15,10 +15,8 @@ SECURITY (required)
: One of 'wpa', 'wep', 'none' or 'wpa-config'
KEY (required for SECURITY of 'wpa' or 'wep' only)
: Wireless encryption key.
-ESSID (this or AP is required)
-: Name of network to connect to. Note that for "wireless-dbus" profiles this is always a Gnu regexp (as interpreted by "expr").
-AP (this or ESSID is required)
-: AP of the network to connect to.
+ESSID (required)
+: Name of network to connect to.
TIMEOUT
: Time to wait for association. Defaults to 15 seconds.