system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 10:46:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

doc: use consistent wording in the IP4Config documentation

Browse source
This commit is contained in:
Dan Williams 2009-11-16 13:37:35 -08:00
parent 960bcb6dfa
commit f790fb38c1
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
libnm-util/nm-setting-ip4-config.c
View file

@ -712,8 +712,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
* NMSettingIP4Config:method:
*
* IPv4 configuration method. If 'auto' is specified then the appropriate
* automatic method (DHCP, PPP, etc) is used for the device and most other
* properties can be left unset. If 'link-local' is specified, then a
* automatic method (DHCP, PPP, etc) is used for the interface and most
* other properties can be left unset. If 'link-local' is specified, then a
* link-local address in the 169.254/16 range will be assigned to the
* interface. If 'manual' is specified, static IP addressing is used and at
* least one IP address must be given in the 'addresses' property. If
@ -729,7 +729,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
"Method",
"IPv4 configuration method. If 'auto' is specified "
"then the appropriate automatic method (DHCP, PPP, "
"etc) is used for the device and most other "
"etc) is used for the interface and most other "
"properties can be left unset. If 'link-local' "
"is specified, then a link-local address in the "
"169.254/16 range will be assigned to the "
@ -749,7 +749,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
/**
* NMSettingIP4Config:dns:
*
* List of DNS servers (network byte order). If the 'auto' method, these
* List of DNS servers (network byte order). For the 'auto' method, these
* DNS servers are appended to those (if any) returned by automatic
* configuration. DNS servers cannot be used with the 'shared' or
* 'link-local' methods as there is no usptream network. In all other
@ -760,7 +760,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
(object_class, PROP_DNS,
_nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS,
"DNS",
"List of DNS servers (network byte order). If "
"List of DNS servers (network byte order). For "
"the 'auto' method, these DNS servers are "
"appended to those (if any) returned by automatic "
"configuration. DNS servers cannot be used with "
@ -774,24 +774,24 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
/**
* NMSettingIP4Config:dns-search:
*
* List of DNS search domains. If the 'auto' method is used, these search
* domains are appended to those returned by automatic configuration.
* Search domains cannot be used with the 'shared' or 'link-local' methods
* as there is no upstream network. In all other methods, these search
* domains are used as the only search domains for this connection.
* List of DNS search domains. For the 'auto' method, these search domains
* are appended to those returned by automatic configuration. Search domains
* cannot be used with the 'shared' or 'link-local' methods as there is no
* upstream network. In all other methods, these search domains are used
* as the only search domains for this connection.
**/
g_object_class_install_property
(object_class, PROP_DNS_SEARCH,
_nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS_SEARCH,
"DNS search",
"List of DNS search domains. If the 'auto' "
"method is used, these search domains are "
"appended to those returned by automatic "
"configuration. Search domains cannot be used "
"with the 'shared' or 'link-local' methods as "
"there is no upstream network. In all other "
"methods, these search domains are used as the "
"only search domains for this connection.",
"List of DNS search domains. For the 'auto' "
"method, these search domains are appended to "
"those returned by automatic configuration. "
"Search domains cannot be used with the 'shared' "
"or 'link-local' methods as there is no upstream "
"network. In all other methods, these search "
"domains are used as the only search domains for "
"this connection.",
DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));