Imported Upstream version 1.26

[platform/upstream/connman.git] / doc / config-format.txt

diff --git a/doc/config-format.txt b/doc/config-format.txt
index d825070..b16f4e4 100644 (file)
--- a/doc/config-format.txt
+++ b/doc/config-format.txt
@@ -87,6 +87,10 @@ The following options are valid if Type is "wifi"
   Prefix the value with "EAP-" to indicate the usage of an EAP-based inner
   authentication method (should only be used with EAP = TTLS).
 - Passphrase: RSN/WPA/WPA2 Passphrase
+- Security: The security type of the network. Possible values are 'psk'
+  (WPA/WPA2 PSK), 'ieee8021x' (WPA EAP), 'none' and 'wep'. When not set, the
+  default value is 'ieee8021x' if an EAP type is configured, 'psk' if a
+  passphrase is present and 'none' otherwise.
 - Hidden: If set to true, then this AP is hidden. If missing or set to false,
   then AP is not hidden.