Merge branch 'serializ' into 'master'

docs: Standardize spelling of serializ*

See merge request GNOME/glib!2090

Helps: #2399
This commit is contained in:
Philip Withnall 2021-05-10 09:50:07 +00:00
commit 66fe1da95a
2 changed files with 5 additions and 5 deletions

View File

@ -136,7 +136,7 @@ the dconf database.
<term><option>get</option></term> <term><option>get</option></term>
<listitem><para> <listitem><para>
Gets the value of <replaceable>KEY</replaceable>. Gets the value of <replaceable>KEY</replaceable>.
The value is printed out as a serialised The value is printed out as a serialized
<link linkend="GVariant"><type>GVariant</type></link>. <link linkend="GVariant"><type>GVariant</type></link>.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
@ -175,7 +175,7 @@ Queries the description of valid values for <replaceable>KEY</replaceable>.
<term><option>set</option></term> <term><option>set</option></term>
<listitem><para> <listitem><para>
Sets the value of <replaceable>KEY</replaceable> to Sets the value of <replaceable>KEY</replaceable> to
<replaceable>VALUE</replaceable>. The value is specified as a serialised <replaceable>VALUE</replaceable>. The value is specified as a serialized
<link linkend="GVariant"><type>GVariant</type></link>. <link linkend="GVariant"><type>GVariant</type></link>.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>

View File

@ -263,7 +263,7 @@
<para> <para>
Used as a prefix for a GVariant type string (not a prefix for a format string, so <literal>&amp;s</literal> is Used as a prefix for a GVariant type string (not a prefix for a format string, so <literal>&amp;s</literal> is
a valid format string but <literal>&amp;@s</literal> is not). a valid format string but <literal>&amp;@s</literal> is not).
Denotes that a C pointer to serialised data Denotes that a C pointer to serialized data
should be used in place of the normal C type. See should be used in place of the normal C type. See
<link linkend='gvariant-format-strings-pointers'>Pointers</link> below. <link linkend='gvariant-format-strings-pointers'>Pointers</link> below.
</para> </para>
@ -946,7 +946,7 @@ data = g_variant_new_parsed ("(%o, {'brightness': {'value': <%i>, 'max': <%i>}})
</para> </para>
<para> <para>
The '<code>&amp;</code>' character is used to indicate that serialised data should be directly exchanged via a The '<code>&amp;</code>' character is used to indicate that serialized data should be directly exchanged via a
pointer. pointer.
</para> </para>
<para> <para>
@ -954,7 +954,7 @@ data = g_variant_new_parsed ("(%o, {'brightness': {'value': <%i>, 'max': <%i>}})
'<literal>&amp;o</literal>' or '<code>&amp;g</code>'). For '<literal>&amp;o</literal>' or '<code>&amp;g</code>'). For
<link linkend='g-variant-new'><function>g_variant_new()</function></link> this has absolutely no effect. The string <link linkend='g-variant-new'><function>g_variant_new()</function></link> this has absolutely no effect. The string
is collected and duplicated normally. For <link linkend='g-variant-get'><function>g_variant_get()</function></link> is collected and duplicated normally. For <link linkend='g-variant-get'><function>g_variant_get()</function></link>
it means that instead of creating a newly allocated copy of the string, a pointer to the serialised data is it means that instead of creating a newly allocated copy of the string, a pointer to the serialized data is
returned. This pointer should not be freed. Validity checks are performed to ensure that the string data will returned. This pointer should not be freed. Validity checks are performed to ensure that the string data will
always be properly nul-terminated. always be properly nul-terminated.
</para> </para>