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-pppoe.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-pppoe.sgml')
| -rw-r--r-- | docs/libnm-util/tmpl/nm-setting-pppoe.sgml | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml index 3c022169..1ab1ae55 100644 --- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml +++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml @@ -22,54 +22,47 @@ NMSettingPPPOE <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMSettingPPPOE ##### --> +<!-- ##### MACRO NM_SETTING_PPPOE_SETTING_NAME ##### --> <para> </para> -<!-- ##### ARG NMSettingPPPOE:password ##### --> -<para> - -</para> -<!-- ##### ARG NMSettingPPPOE:password-flags ##### --> +<!-- ##### ENUM NMSettingPPPOEError ##### --> <para> </para> -<!-- ##### ARG NMSettingPPPOE:service ##### --> +@NM_SETTING_PPPOE_ERROR_UNKNOWN: +@NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: +@NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: +@NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: + +<!-- ##### MACRO NM_SETTING_PPPOE_ERROR ##### --> <para> </para> -<!-- ##### ARG NMSettingPPPOE:username ##### --> -<para> -</para> -<!-- ##### STRUCT NMSettingPPPOEClass ##### --> +<!-- ##### FUNCTION nm_setting_pppoe_error_quark ##### --> <para> </para> -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: +@void: +@Returns: -<!-- ##### ENUM NMSettingPPPOEError ##### --> + +<!-- ##### MACRO NM_SETTING_PPPOE_SERVICE ##### --> <para> </para> -@NM_SETTING_PPPOE_ERROR_UNKNOWN: -@NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: -@NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: -@NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: -<!-- ##### MACRO NM_SETTING_PPPOE_ERROR ##### --> + +<!-- ##### MACRO NM_SETTING_PPPOE_USERNAME ##### --> <para> </para> @@ -90,46 +83,53 @@ NMSettingPPPOE -<!-- ##### MACRO NM_SETTING_PPPOE_SERVICE ##### --> +<!-- ##### STRUCT NMSettingPPPOE ##### --> <para> </para> - -<!-- ##### MACRO NM_SETTING_PPPOE_SETTING_NAME ##### --> +<!-- ##### ARG NMSettingPPPOE:password ##### --> <para> </para> +<!-- ##### ARG NMSettingPPPOE:password-flags ##### --> +<para> +</para> -<!-- ##### MACRO NM_SETTING_PPPOE_USERNAME ##### --> +<!-- ##### ARG NMSettingPPPOE:service ##### --> <para> </para> +<!-- ##### ARG NMSettingPPPOE:username ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_setting_pppoe_error_quark ##### --> +<!-- ##### STRUCT NMSettingPPPOEClass ##### --> <para> </para> -@void: -@Returns: - +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: -<!-- ##### FUNCTION nm_setting_pppoe_get_password ##### --> +<!-- ##### FUNCTION nm_setting_pppoe_new ##### --> <para> </para> -@setting: +@void: @Returns: -<!-- ##### FUNCTION nm_setting_pppoe_get_password_flags ##### --> +<!-- ##### FUNCTION nm_setting_pppoe_get_service ##### --> <para> </para> @@ -138,7 +138,7 @@ NMSettingPPPOE @Returns: -<!-- ##### FUNCTION nm_setting_pppoe_get_service ##### --> +<!-- ##### FUNCTION nm_setting_pppoe_get_username ##### --> <para> </para> @@ -147,7 +147,7 @@ NMSettingPPPOE @Returns: -<!-- ##### FUNCTION nm_setting_pppoe_get_username ##### --> +<!-- ##### FUNCTION nm_setting_pppoe_get_password ##### --> <para> </para> @@ -156,12 +156,12 @@ NMSettingPPPOE @Returns: -<!-- ##### FUNCTION nm_setting_pppoe_new ##### --> +<!-- ##### FUNCTION nm_setting_pppoe_get_password_flags ##### --> <para> </para> -@void: +@setting: @Returns: |