diff options
| author | Michael Biebl <biebl@debian.org> | 2015-01-22 00:29:53 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-01-22 00:29:53 +0100 |
| commit | 4d939c60d4ac257a2977871baf3b8b3671b5a4f7 (patch) | |
| tree | 318c08dea542d7865422af76e2d36a9559340cd3 /docs/libnm-util/tmpl/nm-setting.sgml | |
| parent | bb9eef75b2aaaab741e2b99911c8be3db6d1bc0b (diff) | |
| parent | 2c032d8f1c6292c1338a615e6ec40252889ba85c (diff) | |
Merge tag 'upstream/1.0.0' into experimental
Upstream version 1.0.0
Diffstat (limited to 'docs/libnm-util/tmpl/nm-setting.sgml')
| -rw-r--r-- | docs/libnm-util/tmpl/nm-setting.sgml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml index d5df34e5..d781e4cc 100644 --- a/docs/libnm-util/tmpl/nm-setting.sgml +++ b/docs/libnm-util/tmpl/nm-setting.sgml @@ -104,6 +104,8 @@ NMSetting @NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: @NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS: @NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS: +@NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT: +@NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT: <!-- ##### STRUCT NMSetting ##### --> <para> @@ -233,6 +235,8 @@ NMSetting @NM_SETTING_DIFF_RESULT_UNKNOWN: @NM_SETTING_DIFF_RESULT_IN_A: @NM_SETTING_DIFF_RESULT_IN_B: +@NM_SETTING_DIFF_RESULT_IN_A_DEFAULT: +@NM_SETTING_DIFF_RESULT_IN_B_DEFAULT: <!-- ##### FUNCTION nm_setting_diff ##### --> <para> |