diff options
author | Jiří Klimeš <jklimes@redhat.com> | 2013-02-18 15:57:12 +0100 |
---|---|---|
committer | Jiří Klimeš <jklimes@redhat.com> | 2013-02-18 15:57:12 +0100 |
commit | 2fef987980605736052734b740f064d603a14179 (patch) | |
tree | d8e1d9cc5a70a0be6736d67ca310603ba962a810 /libnm-util/nm-setting-vlan.c | |
parent | 1dca1e3c3d19030d08d6ef29917d2e542138f50d (diff) | |
download | NetworkManager-2fef987980605736052734b740f064d603a14179.tar.gz |
libnm-util: add the detailed description of carrier-detect to blurb as well
So that we have the description in generated html documentation and nm-settings
manual page.
Diffstat (limited to 'libnm-util/nm-setting-vlan.c')
-rw-r--r-- | libnm-util/nm-setting-vlan.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index 92d5a3d23e..d8dff7b6a4 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -819,7 +819,13 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) (object_class, PROP_CARRIER_DETECT, g_param_spec_string (NM_SETTING_VLAN_CARRIER_DETECT, "Carrier-detect", - "Controls whether device carrier affects this connection.", + "Controls whether device carrier affects this connection. " + "Possible values are 'no', meaning the connection completely " + "ignores carrier; 'yes', meaning the connection can only be " + "activated if carrier is present, and will be deactivated " + "automatically if carrier is lost; and 'on-activate', meaning " + "the connection can only be activated if carrier is present, " + "but will not be deactivated if carrier is lost.", "yes", G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); } |