---
 doc/service-api.txt |   69 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/doc/service-api.txt b/doc/service-api.txt
index c1dd541..b8b694b 100644
--- a/doc/service-api.txt
+++ b/doc/service-api.txt
@@ -410,13 +410,78 @@ Properties        string State [readonly]
                                If no automatic configuration is available,
                                then "direct" is set.
 
-                               The values "auto" and "manual" are not yet
-                               supported.
+                               The value "auto" is not yet supported.
 
                        string URL [readonly]
 
                                Automatic proxy configuration URL.
 
+                       string Http [readonly]
+
+                               Address/hostname for HTTP proxy. Used when
+                               Method is "manual"
+
+                       uint16 HttpPort [readonly]
+
+                               Port number for HTTP proxy. Used if Http has
+                               a value.
+
+                       string Https [readonly]
+
+                               Address/hostname for HTTPS proxy. Used when
+                               Method is "manual"
+
+                       uint16 HttpsPort [readonly]
+
+                               Port number for HTTPS proxy. Used if Https has
+                               a value.
+
+                       string Ftp [readonly]
+
+                               Address/hostname for FTP proxy. Used when
+                               Method is "manual"
+
+                       uint16 FtpPort [readonly]
+
+                               Port number for FTP proxy. Used if Ftp has
+                               a value.
+
+                       string Socks [readonly]
+
+                               Address/hostname for socks proxy. Used when
+                               Method is "manual"
+
+                       uint16 SocksPort [readonly]
+
+                               Port number for socks proxy. Used if Socks has
+                               a value.
+
+                       string Rtsp [readonly]
+
+                               Address/hostname for RTSP proxy. Used when
+                               Method is "manual"
+
+                       uint16 RtspPort [readonly]
+
+                               Port number for RTSP proxy. Used if Rtsp has
+                               a value.
+
+                       array{string} Ignore [readonly]
+
+                               List of networks or hostnames that do not
+                               have a proxy.
+
+               dict Proxy.Configuration [readwrite]
+
+                       Same values as Proxy property. The Proxy represents
+                       the actual system configuration while this allows
+                       user configuration.
+
+                       The proxy port must be set the same time as proxy host
+                       when saving initial entry. It is possible to update
+                       the port and host individually of an existing proxy
+                       setting.
+
                dict Provider [readonly]
 
                        string Host [readonly]
-- 
1.7.0.4

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman

Reply via email to