From f790fb38c15ff7837a4f28d012130b78fdfece03 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 16 Nov 2009 13:37:35 -0800 Subject: [PATCH] doc: use consistent wording in the IP4Config documentation --- libnm-util/nm-setting-ip4-config.c | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index 02f1e63bd5..580369fd13 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -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));