diff options
| author | James Rayner <james@archlinux.org> | 2009-08-10 08:09:16 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-08-10 08:09:16 +0200 |
| commit | 9a3078d8cec470b3820c5597d5c8819d642e558d (patch) | |
| tree | 7287f79ad908eb8cd6352b19c3e59e6bc57e4c94 /doc | |
| parent | 280b25e1171a4609356e888066614a4dc2ecb678 (diff) | |
| download | netctl-9a3078d8cec470b3820c5597d5c8819d642e558d.tar.gz netctl-9a3078d8cec470b3820c5597d5c8819d642e558d.tar.xz | |
revert pryor patch
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/wireless | 7 | ||||
| -rw-r--r-- | doc/wireless-dbus | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/doc/wireless b/doc/wireless index e1f649e..20ced91 100644 --- a/doc/wireless +++ b/doc/wireless @@ -17,10 +17,8 @@ SECURITY (required for security of 'wep', 'wpa' or 'wpa-config') : One of 'wpa', 'wep', 'none' or 'wpa-config'. Defaults to 'none' KEY (required for SECURITY of 'wpa' or 'wep' only) : Wireless encryption key. -ESSID (this or AP is required) +ESSID (required) : Name of network to connect to. -AP (this or ESSID is required) -: AP of the network to connect to. TIMEOUT (optional) : Time to wait for association. Defaults to 15 seconds. SCAN (optional) @@ -33,6 +31,3 @@ WPA_CONF (for SECURITY of 'wpa-config' only) : Path to wpa_supplicant configuration. Defaults to '/etc/wpa_supplicant.conf' WPA_OPTS : Extra arguments for wpa_supplicant not specified otherwise. Any option here must specify wpa_supplicant driver. Defaults to '-Dwext'. -WPA_GROUP -: Group that has authority for on-the-fly config files created when SECURITY="wpa" - 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. |