X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=doc%2Fconnman-service.config.5.in;h=701f61f9ea1397b4970e56b028abcc905468c568;hb=f2a9f93bbb2df62e3b3246ea253f8aaae29234d2;hp=535c626c87306c5937e3b0fbca07e72bbe2cd331;hpb=9362752a471a5c892d679548fbf2828d5fc5684b;p=platform%2Fupstream%2Fconnman.git

diff --git a/doc/connman-service.config.5.in b/doc/connman-service.config.5.in
index 535c626..701f61f 100644
--- a/doc/connman-service.config.5.in
+++ b/doc/connman-service.config.5.in
@@ -18,8 +18,7 @@ eduroam, or for static IPs and so on. Each provisioning file can be
 used for multiple services at once.
 .SH "FILE FORMAT"
 .P
-The configuration file format is key file format.
-It consists of sections (groups) of key-value pairs.
+The configuration file consists of sections (groups) of key-value pairs.
 Lines beginning with a '#' and blank lines are considered comments.
 Sections are started by a header line containing the section enclosed
 in '[' and ']', and ended implicitly by the start of the next section
@@ -60,6 +59,10 @@ IPv6 privacy settings as per RFC3041.
 MAC address of the interface to be used. If not specified, the first
 found interface is used. Must be in format ab:cd:ef:01:23:45.
 .TP
+.BI DeviceName= ifname
+Device name the interface to be used, e.g. eth0. MAC takes preference
+over DeviceName.
+.TP
 .BI Nameservers= servers
 Comma separated list of nameservers.
 .TP
@@ -96,6 +99,8 @@ configured, \fBpsk\fP if a passphrase is present and \fBnone\fP otherwise.
 If set to \fBtrue\fP, then this AP is hidden. If missing or set to
 \fBfalse\fP, then AP is not hidden.
 .TP
+The following keys are used for WPA EAP (when \fBSecurity=ieee8021x\fP):
+.TP
 .B EAP=tls \fR|\fB ttls \fR|\fB peap
 EAP type to use. Only \fBtls\fP, \fBttls\fP and \fBpeap\fP are supported.
 .TP
@@ -118,6 +123,22 @@ Identity string for EAP.
 .BI AnonymousIdentity= identity
 Anonymous identity string for EAP.
 .TP
+.BI SubjectMatch= substring
+Substring to be matched against the subject of the
+authentication server certificate for EAP.
+.TP
+.BI AltSubjectMatch= substring
+Semicolon separated string of entries to be matched against the alternative
+subject name of the authentication server certificate for EAP.
+.TP
+.BI DomainSuffixMatch= domain
+Constraint for server domain name. If set, this FQDN is used as a suffix match
+requirement for the authentication server certificate for EAP.
+.TP
+.BI DomainMatch= domain
+This FQDN is used as a full match requirement for the
+authentication server certificate for EAP.
+.TP
 .BI Phase2= type
 Inner authentication type with for \fBEAP=tls\fP or \fBEAP=ttls\fP. Prefix
 the value with \fBEAP-\fP to indicate usage of EAP-based authentication
@@ -192,6 +213,11 @@ Name = my_home_wifi
 Passphrase = password
 IPv4 = 192.168.2.2/255.255.255.0/192.168.2.1
 MAC = 06:05:04:03:02:01
+
+[service_vlan]
+Type = ethernet
+DeviceName = enp4s0.1
+IPv4 = 192.168.1.42/255.255.255.0/192.168.1.1
 .fi
 .SH "SEE ALSO"
 .BR connman (8)