From 73e152af6e3fb4f5848bfb8394484026ff119003 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 11 May 2016 17:08:25 +0200 Subject: Imported Upstream version 1.2.2 --- docs/libnm/html/NMSetting.html | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'docs/libnm/html/NMSetting.html') diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html index 1a8a870f..c392ec1f 100644 --- a/docs/libnm/html/NMSetting.html +++ b/docs/libnm/html/NMSetting.html @@ -207,8 +207,8 @@ NMSettingMacRandomization -struct -NMSetting +  +NMSetting enum @@ -219,11 +219,11 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingCompareFlags
     ├── NMSettingDiffResult
     ╰── NMSettingMacRandomization
-    GFlags
+    GFlags
     ╰── NMSettingSecretFlags
     GObject
     ╰── NMSetting
@@ -263,7 +263,7 @@
 
Each NMSetting contains properties that describe configuration that applies
 to a specific network layer (like IPv4 or IPv6 configuration) or device type
 (like Ethernet, or Wi-Fi).  A collection of individual settings together
-make up an NMConnection. Each property is strongly typed and usually has
+make up an NMConnection. Each property is strongly typed and usually has
 a number of allowed values.  See each NMSetting subclass for a description
 of properties and allowed values.
@@ -320,7 +320,7 @@ of properties and allowed values.

user_data

-

User data passed to nm_connection_clear_secrets_with_flags()

+

User data passed to nm_connection_clear_secrets_with_flags()

  @@ -467,7 +467,7 @@ like 'ppp' or 'wireless' or 'wired'.

nm_setting_verify ()

gboolean
 nm_setting_verify (NMSetting *setting,
-                   NMConnection *connection,
+                   NMConnection *connection,
                    GError **error);

Validates the setting. Each setting's properties have allowed values, and some are dependent on other values (hence the need for connection @@ -490,7 +490,7 @@ failed validation, and in what way that property failed validation.

connection

-

the NMConnection that setting +

the NMConnection that setting came from, or NULL if setting is being verified in isolation.

@@ -514,7 +514,7 @@ is being verified in isolation.

nm_setting_verify_secrets ()

gboolean
 nm_setting_verify_secrets (NMSetting *setting,
-                           NMConnection *connection,
+                           NMConnection *connection,
                            GError **error);

Verifies the secrets in the setting. The returned GError contains information about which secret of the setting @@ -537,7 +537,7 @@ in some cases connection failure is not desired just for the secrets.

connection

-

the NMConnection that setting +

the NMConnection that setting came from, or NULL if setting is being verified in isolation.

@@ -994,7 +994,7 @@ two connections.

NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT

if this flag is set, - nm_setting_diff() and nm_connection_diff() will also include properties that + nm_setting_diff() and nm_connection_diff() will also include properties that are set to their default value. See also NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT .

@@ -1004,7 +1004,7 @@ two connections.

NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT

if this flag is set, - nm_setting_diff() and nm_connection_diff() will not include properties that + nm_setting_diff() and nm_connection_diff() will not include properties that are set to their default value. This is the opposite of NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT . If both flags are set together, @@ -1074,8 +1074,8 @@ overridden by user-controlled defaults configuration, is "never".

-

struct NMSetting

-
struct NMSetting;
+

NMSetting

+
typedef struct _NMSetting NMSetting;

The NMSetting struct contains only private data. It should only be accessed through the functions described below.

-- cgit 1.3.0-6-gf8a5