Merge branch 'main' into 'main'

Changed gendered terms to be gender-neutral

See merge request GNOME/glib!2332
This commit is contained in:
Emmanuele Bassi 2021-11-13 21:48:00 +00:00
commit c3a87f171c
3 changed files with 4 additions and 4 deletions

View File

@ -161,7 +161,7 @@
<para> <para>
The GIO model of I/O is stateful: if an application establishes e.g. The GIO model of I/O is stateful: if an application establishes e.g.
a SFTP connection to a server, it becomes available to all applications a SFTP connection to a server, it becomes available to all applications
in the session; the user does not have to enter his password over in the session; the user does not have to enter their password over
and over again. and over again.
</para> </para>
<para> <para>
@ -279,7 +279,7 @@ excellent book on this topic,
When using GIO in code that runs with elevated privileges, you have to When using GIO in code that runs with elevated privileges, you have to
be careful. GIO has extension points whose implementations get loaded be careful. GIO has extension points whose implementations get loaded
from modules (executable code in shared objects), which could allow from modules (executable code in shared objects), which could allow
an attacker to sneak his own code into your application by tricking it an attacker to sneak their own code into your application by tricking it
into loading the code as a module. However, GIO will never load modules into loading the code as a module. However, GIO will never load modules
from your home directory except when explicitly asked to do so via an from your home directory except when explicitly asked to do so via an
environment variable. environment variable.

View File

@ -142,7 +142,7 @@
* "Unknown file name" in its title bar but still let the user save * "Unknown file name" in its title bar but still let the user save
* the file, as it would keep the raw file name internally. This * the file, as it would keep the raw file name internally. This
* can happen if the user has not set the `G_FILENAME_ENCODING` * can happen if the user has not set the `G_FILENAME_ENCODING`
* environment variable even though he has files whose names are * environment variable even though they have files whose names are
* not encoded in UTF-8. * not encoded in UTF-8.
* *
* 3. If your user interface lets the user type a file name for saving * 3. If your user interface lets the user type a file name for saving

View File

@ -901,7 +901,7 @@ g_datalist_id_dup_data (GData **datalist,
* If the previous value was replaced then ownership of the * If the previous value was replaced then ownership of the
* old value (@oldval) is passed to the caller, including * old value (@oldval) is passed to the caller, including
* the registered destroy notify for it (passed out in @old_destroy). * the registered destroy notify for it (passed out in @old_destroy).
* Its up to the caller to free this as he wishes, which may * Its up to the caller to free this as they wish, which may
* or may not include using @old_destroy as sometimes replacement * or may not include using @old_destroy as sometimes replacement
* should not destroy the object in the normal way. * should not destroy the object in the normal way.
* *