From 7025e054d943ae146f1b9f375d47b6871811bc28 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 3 May 2010 00:08:02 -0700 Subject: [PATCH] libnm-util: clarify may-fail behavior --- libnm-util/nm-setting-ip4-config.c | 6 +++--- libnm-util/nm-setting-ip6-config.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index a1a9674af7..186e41e243 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -989,7 +989,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * NMSettingIP4Config:may-fail: * * If TRUE, allow overall network configuration to proceed even if IPv4 - * configuration fails or times out. Note that at least one IP configuration + * configuration times out. Note that at least one IP configuration * must succeed or overall network configuration will still fail. For * example, in IPv6-only networks, setting this property to TRUE allows * the overall network configuration to succeed if IPv4 configuration fails @@ -1000,8 +1000,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) g_param_spec_boolean (NM_SETTING_IP4_CONFIG_MAY_FAIL, "May Fail", "If TRUE, allow overall network configuration to " - "proceed even if IPv4 configuration fails or times " - "out. Note that at least one IP configuration must " + "proceed even if IPv4 configuration times out. " + "Note that at least one IP configuration must " "succeed or overall network configuration will still " "fail. For example, in IPv6-only networks, setting " "this property to TRUE allows the overall network " diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index f92595b705..e8af058041 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -822,7 +822,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) * NMSettingIP6Config:may-fail: * * If TRUE, allow overall network configuration to proceed even if IPv6 - * configuration fails or times out. Note that at least one IP configuration + * configuration times out. Note that at least one IP configuration * must succeed or overall network configuration will still fail. For * example, in IPv4-only networks, setting this property to TRUE allows * the overall network configuration to succeed if IPv6 configuration fails @@ -833,8 +833,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) g_param_spec_boolean (NM_SETTING_IP6_CONFIG_MAY_FAIL, "May Fail", "If TRUE, allow overall network configuration to " - "proceed even if IPv6 configuration fails or times " - "out. Note that at least one IP configuration must " + "proceed even if IPv6 configuration times out. " + "Note that at least one IP configuration must " "succeed or overall network configuration will still " "fail. For example, in IPv4-only networks, setting " "this property to TRUE allows the overall network "