summaryrefslogtreecommitdiff
path: root/doc/advanced-configuration.txt
diff options
context:
space:
mode:
authorZhang zhengguang <zhengguang.zhang@intel.com>2014-07-17 10:37:39 +0800
committerZhang zhengguang <zhengguang.zhang@intel.com>2014-07-17 10:37:39 +0800
commit1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7 (patch)
tree6e991827d28537f7f40f20786c2354fd04a9fdad /doc/advanced-configuration.txt
parentfbe905ab58ecc31fe64c410c5f580cadc30e7f04 (diff)
downloadconnman-1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7.tar.gz
connman-1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7.tar.bz2
connman-1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7.zip
Imported Upstream version 1.24upstream/1.24
Diffstat (limited to 'doc/advanced-configuration.txt')
-rw-r--r--doc/advanced-configuration.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/advanced-configuration.txt b/doc/advanced-configuration.txt
index 3c08c8fd..12c2250e 100644
--- a/doc/advanced-configuration.txt
+++ b/doc/advanced-configuration.txt
@@ -5,7 +5,7 @@ Advanced configuration interface
Configuration basics
====================
-The default configuration method for all servers is automatic or something
+The default configuration method for all services is automatic or something
like DHCP. In almost every case that should be just good enough, but if it
is not, Connection Manager supports manual configuration for Ethernet and
IP settings.
@@ -44,12 +44,12 @@ configuration this call could be used:
"Netmask": "255.255.255.0" })
The configuration itself is a dictionary with various fields. Not all of
-them need to present. A lot of combinations are valid.
+them need to be present. A lot of combinations are valid.
For example the "Method" field has valid settings of "off", "fixed", "manual"
and "dhcp". The "fixed" value however can not be set by any user program. It
is an internal value that some 3G cards require. Switching to "off" will
-remove and IP configuration from the interface. The "manual" method allows
+remove any IP configuration from the interface. The "manual" method allows
for static address configuration. And "dhcp" will use DHCP to retrieve all
required information automatically.