libnm-util: clarify may-fail behavior
authorDan Williams <dcbw@redhat.com>
Mon, 3 May 2010 07:08:02 +0000 (00:08 -0700)
committerDan Williams <dcbw@redhat.com>
Mon, 3 May 2010 07:08:02 +0000 (00:08 -0700)
libnm-util/nm-setting-ip4-config.c
libnm-util/nm-setting-ip6-config.c

index a1a9674..186e41e 100644 (file)
@@ -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 "
index f92595b..e8af058 100644 (file)
@@ -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 "