diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
| commit | e83d1de9b746dbc078ac1cf45f1798e1bc6b7e2f (patch) | |
| tree | c36a40d79a5ae7d2bbca7d240d0a6f664049b435 /docs/libnm-util/tmpl/nm-setting-vpn.sgml | |
| parent | 26283b4c9e5035574a6c168003e7f1da53a8f32a (diff) | |
| parent | a4256940da049f91bbbea5e53e469a59ea9c10f7 (diff) | |
Merge tag 'upstream/0.9.8.8' into experimental
Upstream version 0.9.8.8
Diffstat (limited to 'docs/libnm-util/tmpl/nm-setting-vpn.sgml')
| -rw-r--r-- | docs/libnm-util/tmpl/nm-setting-vpn.sgml | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml index 567776c1..4b323f35 100644 --- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml +++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml @@ -22,60 +22,50 @@ NMSettingVPN <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMSettingVPN ##### --> +<!-- ##### MACRO NM_SETTING_VPN_SETTING_NAME ##### --> <para> </para> -<!-- ##### ARG NMSettingVPN:data ##### --> -<para> - -</para> -<!-- ##### ARG NMSettingVPN:secrets ##### --> +<!-- ##### ENUM NMSettingVpnError ##### --> <para> </para> -<!-- ##### ARG NMSettingVPN:service-type ##### --> +@NM_SETTING_VPN_ERROR_UNKNOWN: +@NM_SETTING_VPN_ERROR_INVALID_PROPERTY: +@NM_SETTING_VPN_ERROR_MISSING_PROPERTY: + +<!-- ##### MACRO NM_SETTING_VPN_ERROR ##### --> <para> </para> -<!-- ##### ARG NMSettingVPN:user-name ##### --> -<para> -</para> -<!-- ##### STRUCT NMSettingVPNClass ##### --> +<!-- ##### FUNCTION nm_setting_vpn_error_quark ##### --> <para> </para> -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: +@void: +@Returns: -<!-- ##### ENUM NMSettingVpnError ##### --> + +<!-- ##### MACRO NM_SETTING_VPN_SERVICE_TYPE ##### --> <para> </para> -@NM_SETTING_VPN_ERROR_UNKNOWN: -@NM_SETTING_VPN_ERROR_INVALID_PROPERTY: -@NM_SETTING_VPN_ERROR_MISSING_PROPERTY: -<!-- ##### USER_FUNCTION NMVPNIterFunc ##### --> + +<!-- ##### MACRO NM_SETTING_VPN_USER_NAME ##### --> <para> </para> -@key: -@value: -@user_data: <!-- ##### MACRO NM_SETTING_VPN_DATA ##### --> @@ -85,129 +75,136 @@ NMSettingVPN -<!-- ##### MACRO NM_SETTING_VPN_ERROR ##### --> +<!-- ##### MACRO NM_SETTING_VPN_SECRETS ##### --> <para> </para> -<!-- ##### MACRO NM_SETTING_VPN_SECRETS ##### --> +<!-- ##### STRUCT NMSettingVPN ##### --> <para> </para> - -<!-- ##### MACRO NM_SETTING_VPN_SERVICE_TYPE ##### --> +<!-- ##### ARG NMSettingVPN:data ##### --> <para> </para> +<!-- ##### ARG NMSettingVPN:secrets ##### --> +<para> +</para> -<!-- ##### MACRO NM_SETTING_VPN_SETTING_NAME ##### --> +<!-- ##### ARG NMSettingVPN:service-type ##### --> <para> </para> +<!-- ##### ARG NMSettingVPN:user-name ##### --> +<para> +</para> -<!-- ##### MACRO NM_SETTING_VPN_USER_NAME ##### --> +<!-- ##### STRUCT NMSettingVPNClass ##### --> <para> </para> +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: - -<!-- ##### FUNCTION nm_setting_vpn_add_data_item ##### --> +<!-- ##### USER_FUNCTION NMVPNIterFunc ##### --> <para> </para> -@setting: @key: -@item: +@value: +@user_data: -<!-- ##### FUNCTION nm_setting_vpn_add_secret ##### --> +<!-- ##### FUNCTION nm_setting_vpn_new ##### --> <para> </para> -@setting: -@key: -@secret: +@void: +@Returns: -<!-- ##### FUNCTION nm_setting_vpn_error_quark ##### --> +<!-- ##### FUNCTION nm_setting_vpn_get_service_type ##### --> <para> </para> -@void: +@setting: @Returns: -<!-- ##### FUNCTION nm_setting_vpn_foreach_data_item ##### --> +<!-- ##### FUNCTION nm_setting_vpn_get_user_name ##### --> <para> </para> @setting: -@func: -@user_data: +@Returns: -<!-- ##### FUNCTION nm_setting_vpn_foreach_secret ##### --> +<!-- ##### FUNCTION nm_setting_vpn_get_num_data_items ##### --> <para> </para> @setting: -@func: -@user_data: +@Returns: -<!-- ##### FUNCTION nm_setting_vpn_get_data_item ##### --> +<!-- ##### FUNCTION nm_setting_vpn_add_data_item ##### --> <para> </para> @setting: @key: -@Returns: +@item: -<!-- ##### FUNCTION nm_setting_vpn_get_num_data_items ##### --> +<!-- ##### FUNCTION nm_setting_vpn_get_data_item ##### --> <para> </para> @setting: +@key: @Returns: -<!-- ##### FUNCTION nm_setting_vpn_get_num_secrets ##### --> +<!-- ##### FUNCTION nm_setting_vpn_remove_data_item ##### --> <para> </para> @setting: -@Returns: +@key: -<!-- ##### FUNCTION nm_setting_vpn_get_secret ##### --> +<!-- ##### FUNCTION nm_setting_vpn_foreach_data_item ##### --> <para> </para> @setting: -@key: -@Returns: +@func: +@user_data: -<!-- ##### FUNCTION nm_setting_vpn_get_service_type ##### --> +<!-- ##### FUNCTION nm_setting_vpn_get_num_secrets ##### --> <para> </para> @@ -216,25 +213,27 @@ NMSettingVPN @Returns: -<!-- ##### FUNCTION nm_setting_vpn_get_user_name ##### --> +<!-- ##### FUNCTION nm_setting_vpn_add_secret ##### --> <para> </para> @setting: -@Returns: +@key: +@secret: -<!-- ##### FUNCTION nm_setting_vpn_new ##### --> +<!-- ##### FUNCTION nm_setting_vpn_get_secret ##### --> <para> </para> -@void: +@setting: +@key: @Returns: -<!-- ##### FUNCTION nm_setting_vpn_remove_data_item ##### --> +<!-- ##### FUNCTION nm_setting_vpn_remove_secret ##### --> <para> </para> @@ -243,12 +242,13 @@ NMSettingVPN @key: -<!-- ##### FUNCTION nm_setting_vpn_remove_secret ##### --> +<!-- ##### FUNCTION nm_setting_vpn_foreach_secret ##### --> <para> </para> @setting: -@key: +@func: +@user_data: |