Commit a3d7806b authored by Matthias Clasen's avatar Matthias Clasen

Revert mistaken change: it is UNIX, not Unix.

        * glib/tmpl/completion.sgml, glib/tmpl/date.sgml,
        glib/tmpl/fileutils.sgml, glib/tmpl/iochannels.sgml,
        glib/tmpl/macros.sgml, glib/tmpl/memory.sgml,
        glib/tmpl/misc_utils.sgml, glib/tmpl/warnings.sgml,
        glib/tmpl/windows.sgml: Revert mistaken change: it is UNIX, not Unix.

        * glib/tmpl/memory_chunks.sgml,
        glib/tmpl/date.sgml, glib/tmpl/threads.sgml,
        glib/tmpl/gtype.sgml: Trivial markup fixes.

        * glib/gconvert.c, glib/giochannel.c, glib/gmain.c,
        glib/gwin32.c: Revert mistaken change: it is UNIX, not Unix.
parent 9b83c289
2001-12-13 Matthias Clasen <matthiasc@poet.de>
* glib/gconvert.c, glib/giochannel.c, glib/gmain.c,
glib/gwin32.c: Revert mistaken change: it is UNIX, not Unix.
Thu Dec 13 05:37:51 2001 Tim Janik <timj@gtk.org>
* glib/gbsearcharray.[hc]: API revamp to shorten GValueArray
......
2001-12-13 Matthias Clasen <matthiasc@poet.de>
* glib/gconvert.c, glib/giochannel.c, glib/gmain.c,
glib/gwin32.c: Revert mistaken change: it is UNIX, not Unix.
Thu Dec 13 05:37:51 2001 Tim Janik <timj@gtk.org>
* glib/gbsearcharray.[hc]: API revamp to shorten GValueArray
......
2001-12-13 Matthias Clasen <matthiasc@poet.de>
* glib/gconvert.c, glib/giochannel.c, glib/gmain.c,
glib/gwin32.c: Revert mistaken change: it is UNIX, not Unix.
Thu Dec 13 05:37:51 2001 Tim Janik <timj@gtk.org>
* glib/gbsearcharray.[hc]: API revamp to shorten GValueArray
......
2001-12-13 Matthias Clasen <matthiasc@poet.de>
* glib/gconvert.c, glib/giochannel.c, glib/gmain.c,
glib/gwin32.c: Revert mistaken change: it is UNIX, not Unix.
Thu Dec 13 05:37:51 2001 Tim Janik <timj@gtk.org>
* glib/gbsearcharray.[hc]: API revamp to shorten GValueArray
......
2001-12-13 Matthias Clasen <matthiasc@poet.de>
* glib/gconvert.c, glib/giochannel.c, glib/gmain.c,
glib/gwin32.c: Revert mistaken change: it is UNIX, not Unix.
Thu Dec 13 05:37:51 2001 Tim Janik <timj@gtk.org>
* glib/gbsearcharray.[hc]: API revamp to shorten GValueArray
......
2001-12-13 Matthias Clasen <matthiasc@poet.de>
* glib/gconvert.c, glib/giochannel.c, glib/gmain.c,
glib/gwin32.c: Revert mistaken change: it is UNIX, not Unix.
Thu Dec 13 05:37:51 2001 Tim Janik <timj@gtk.org>
* glib/gbsearcharray.[hc]: API revamp to shorten GValueArray
......
2001-12-13 Matthias Clasen <matthiasc@poet.de>
* glib/gconvert.c, glib/giochannel.c, glib/gmain.c,
glib/gwin32.c: Revert mistaken change: it is UNIX, not Unix.
Thu Dec 13 05:37:51 2001 Tim Janik <timj@gtk.org>
* glib/gbsearcharray.[hc]: API revamp to shorten GValueArray
......
2001-12-13 Matthias Clasen <matthiasc@poet.de>
* glib/gconvert.c, glib/giochannel.c, glib/gmain.c,
glib/gwin32.c: Revert mistaken change: it is UNIX, not Unix.
Thu Dec 13 05:37:51 2001 Tim Janik <timj@gtk.org>
* glib/gbsearcharray.[hc]: API revamp to shorten GValueArray
......
2001-12-13 Matthias Clasen <matthiasc@poet.de>
* glib/tmpl/completion.sgml, glib/tmpl/date.sgml,
glib/tmpl/fileutils.sgml, glib/tmpl/iochannels.sgml,
glib/tmpl/macros.sgml, glib/tmpl/memory.sgml,
glib/tmpl/misc_utils.sgml, glib/tmpl/warnings.sgml,
glib/tmpl/windows.sgml: Revert mistaken change: it is UNIX, not Unix.
* glib/tmpl/memory_chunks.sgml,
glib/tmpl/date.sgml, glib/tmpl/threads.sgml,
glib/tmpl/gtype.sgml: Trivial markup fixes.
2001-12-12 Matthias Clasen <matthiasc@poet.de>
* glib/tmpl/string_utils.sgml: Correct docs for g_[v]snprintf.
......
......@@ -8,7 +8,7 @@ support for automatic completion using a group of target strings.
<para>
#GCompletion provides support for automatic completion of a string using
any group of target strings. It is typically used for file name completion
as is common in many Unix shells.
as is common in many UNIX shells.
</para>
<para>
A #GCompletion is created using g_completion_new().
......
......@@ -75,7 +75,7 @@ code readability.
<para>
Represents a precise time, with seconds and microseconds. Same as the
<structname>struct timeval</structname> returned by the
<function>gettimeofday()</function> Unix call.
<function>gettimeofday()</function> UNIX call.
</para>
@tv_sec: seconds.
......@@ -329,7 +329,7 @@ Sets the value of a #GDate from a Julian day number.
Sets the value of a date from a #GTime (<type>time_t</type>) value.
To set the value of a date to the current day, you could write:
<informalexample><programlisting>
g_date_set_time(date, time(NULL));
g_date_set_time (date, time (NULL));
</programlisting></informalexample>
</para>
......
......@@ -17,9 +17,9 @@ various file-related functions.
<!-- ##### ENUM GFileError ##### -->
<para>
Values corresponding to <literal>errno</literal> codes returned from file operations
on Unix. Unlike <literal>errno</literal> codes, #GFileError values are available on
on UNIX. Unlike <literal>errno</literal> codes, #GFileError values are available on
all systems, even Windows. The exact meaning of each code depends on what
sort of file operation you were performing; the Unix documentation
sort of file operation you were performing; the UNIX documentation
gives more details. The following error code descriptions come
from the GNU C Library manual, and are under the copyright
of that manual.
......
......@@ -9,11 +9,11 @@ portable support for using files, pipes and sockets.
The #GIOChannel data type aims to provide a portable method for using file
descriptors, pipes, and sockets, and integrating them into the
<link linkend="glib-The-Main-Event-Loop">main event loop</link>.
Currently full support is available on Unix platforms, support for
Currently full support is available on UNIX platforms, support for
Windows is only partially complete.
</para>
<para>
To create a new #GIOChannel on Unix systems use g_io_channel_unix_new().
To create a new #GIOChannel on UNIX systems use g_io_channel_unix_new().
This works for plain file descriptors, pipes and sockets.
Alternatively, a channel can be created for a file in a system independent
manner using g_io_channel_new_file().
......@@ -81,7 +81,7 @@ private and should only be accessed with the following functions.
<!-- ##### FUNCTION g_io_channel_unix_new ##### -->
<para>
Creates a new #GIOChannel given a file descriptor.
On Unix systems this works for plain files, pipes, and sockets.
On UNIX systems this works for plain files, pipes, and sockets.
</para>
<para>
The returned #GIOChannel has a reference count of 1.
......@@ -93,7 +93,7 @@ The returned #GIOChannel has a reference count of 1.
<!-- ##### FUNCTION g_io_channel_unix_get_fd ##### -->
<para>
Returns the file descriptor of the Unix #GIOChannel.
Returns the file descriptor of the UNIX #GIOChannel.
</para>
@channel: a #GIOChannel, created with g_io_channel_unix_new().
......@@ -449,9 +449,9 @@ g_io_channel_set_flags().
</para>
@G_IO_FLAG_APPEND: turns on append mode, corresponds to %O_APPEND (see the
documentation of the Unix <function>open()</function> syscall).
documentation of the UNIX <function>open()</function> syscall).
@G_IO_FLAG_NONBLOCK: turns on nonblocking mode, corresponds to
%O_NONBLOCK/%O_NDELAY (see the documentation of the Unix
%O_NONBLOCK/%O_NDELAY (see the documentation of the UNIX
<function>open()</function> syscall).
@G_IO_FLAG_IS_READABLE: indicates that the io channel is readable. This flag
can not be changed.
......
......@@ -53,8 +53,8 @@ BeOS-specific code in "#ifdef G_OS_BEOS".
<!-- ##### MACRO G_OS_UNIX ##### -->
<para>
This macro is defined only on Unix. So you can bracket
Unix-specific code in "#ifdef G_OS_UNIX".
This macro is defined only on UNIX. So you can bracket
UNIX-specific code in "#ifdef G_OS_UNIX".
</para>
......@@ -82,7 +82,7 @@ version.
<!-- ##### MACRO G_DIR_SEPARATOR ##### -->
<para>
The directory separator character.
This is '/' on Unix machines and '\' under Windows.
This is '/' on UNIX machines and '\' under Windows.
</para>
......@@ -90,7 +90,7 @@ This is '/' on Unix machines and '\' under Windows.
<!-- ##### MACRO G_DIR_SEPARATOR_S ##### -->
<para>
The directory separator as a string.
This is "/" on Unix machines and "\" under Windows.
This is "/" on UNIX machines and "\" under Windows.
</para>
......@@ -98,7 +98,7 @@ This is "/" on Unix machines and "\" under Windows.
<!-- ##### MACRO G_SEARCHPATH_SEPARATOR ##### -->
<para>
The search path separator character.
This is ':' on Unix machines and ';' under Windows.
This is ':' on UNIX machines and ';' under Windows.
</para>
......@@ -106,7 +106,7 @@ This is ':' on Unix machines and ';' under Windows.
<!-- ##### MACRO G_SEARCHPATH_SEPARATOR_S ##### -->
<para>
The search path separator as a string.
This is ":" on Unix machines and ";" under Windows.
This is ":" on UNIX machines and ";" under Windows.
</para>
......
......@@ -125,7 +125,7 @@ If @mem is %NULL it simply returns.
<para>
Allocates @size bytes on the stack; these bytes will be freed when the current
stack frame is cleaned up. This macro essentially just wraps the
<function>alloca()</function> function present on most Unix variants.
<function>alloca()</function> function present on most UNIX variants.
Thus it provides the same advantages and pitfalls as <function>alloca()</function>:
<msgtext><variablelist>
<varlistentry><term></term><listitem><para>
......
......@@ -99,7 +99,7 @@ To help debug memory chunks, use g_mem_chunk_info() and g_mem_chunk_print().
memory block, and we want to be able to free individual atoms. */
array_mem_chunk = g_mem_chunk_create (GRealArray, 1024, G_ALLOC_AND_FREE);
/* Allocate one atom, using the g_chunk_new() convenience macro. */
/* Allocate one atom, using the g_chunk_new(<!>) convenience macro. */
array = g_chunk_new (GRealArray, array_mem_chunk);
/* We can now use array just like a normal pointer to a structure. */
......
......@@ -73,7 +73,7 @@ Gets the current user's home directory.
Gets the directory to use for temporary files.
This is found from inspecting the environment variables <envar>TMPDIR</envar>,
<envar>TMP</envar>, and <envar>TEMP</envar>
in that order. If none of those are defined "/tmp" is returned on Unix and
in that order. If none of those are defined "/tmp" is returned on UNIX and
"C:\" on Windows.
</para>
......@@ -124,7 +124,7 @@ The returned string should be freed when no longer needed.
<para>
Returns %TRUE if the given @file_name is an absolute file name,
i.e. it contains a full path from the root directory such as '/usr/local'
on Unix or 'C:\windows' on Windows systems.
on UNIX or 'C:\windows' on Windows systems.
</para>
@file_name: a file name.
......@@ -134,7 +134,7 @@ on Unix or 'C:\windows' on Windows systems.
<!-- ##### FUNCTION g_path_skip_root ##### -->
<para>
Returns a pointer into @file_name after the root component, i.e. after
the '/' in Unix or 'C:\' under Windows. If @file_name is not an absolute
the '/' in UNIX or 'C:\' under Windows. If @file_name is not an absolute
path it returns %NULL.
</para>
......
......@@ -510,12 +510,12 @@ not use such constructs in your own programs. One working solution is:
<programlisting>
static GMutex *give_me_next_number_mutex = NULL;
/* this function must be called before any call to give_me_next_number ()
/* this function must be called before any call to give_me_next_number (<!>)
it must be called exactly once. */
void init_give_me_next_number (<!>)
{
g_assert (give_me_next_number_mutex == NULL);
give_me_next_number_mutex = g_mutex_new ();
give_me_next_number_mutex = g_mutex_new (<!>);
}
int give_me_next_number (<!>)
......
......@@ -172,7 +172,7 @@ The prompt is then shown again.
If [P]roceed is selected, the function returns.
</para>
<para>
This function may cause different actions on non-Unix platforms.
This function may cause different actions on non-UNIX platforms.
</para>
@prg_name: the program name, needed by <command>gdb</command> for the [S]tack trace option.
......@@ -186,7 +186,7 @@ Invokes <command>gdb</command>, which attaches to the current process and shows
Called by g_on_error_query() when the [S]tack trace option is selected.
</para>
<para>
This function may cause different actions on non-Unix platforms.
This function may cause different actions on non-UNIX platforms.
</para>
@prg_name: the program name, needed by <command>gdb</command> for the [S]tack trace option.
......
......@@ -2,7 +2,7 @@
Windows Compatibility Functions
<!-- ##### SECTION Short_Description ##### -->
Unix emulation on Windows.
UNIX emulation on Windows.
<!-- ##### SECTION Long_Description ##### -->
<para>
......@@ -16,7 +16,7 @@ Unix emulation on Windows.
<!-- ##### MACRO MAXPATHLEN ##### -->
<para>
Provided for Unix emulation on Windows; equivalent to Unix
Provided for UNIX emulation on Windows; equivalent to UNIX
macro %MAXPATHLEN, which is the maximum length of a filename
(including full path).
</para>
......@@ -25,14 +25,14 @@ macro %MAXPATHLEN, which is the maximum length of a filename
<!-- ##### TYPEDEF pid_t ##### -->
<para>
Provided for Unix emulation on Windows; process ID type.
Provided for UNIX emulation on Windows; process ID type.
</para>
<!-- ##### MACRO pipe ##### -->
<para>
Provided for Unix emulation on Windows; see documentation for <function>pipe()</function>
in any Unix manual.
Provided for UNIX emulation on Windows; see documentation for <function>pipe()</function>
in any UNIX manual.
</para>
@phandles:
......@@ -40,8 +40,8 @@ in any Unix manual.
<!-- ##### MACRO ftruncate ##### -->
<para>
Provided for Unix emulation on Windows; see documentation for <function>ftruncate()</function>
in any Unix manual.
Provided for UNIX emulation on Windows; see documentation for <function>ftruncate()</function>
in any UNIX manual.
</para>
@fd:
......
......@@ -93,8 +93,8 @@ extern const char **_g_charset_get_aliases (const char *canonical_name);
* @to_codeset: destination codeset
* @from_codeset: source codeset
*
* Same as the standard Unix routine <function>iconv_open()</function>, but
* may be implemented via libiconv on Unix flavors that lack
* Same as the standard UNIX routine <function>iconv_open()</function>, but
* may be implemented via libiconv on UNIX flavors that lack
* a native implementation.
*
* &GLib; provides g_convert() and g_locale_to_utf8() which are likely
......@@ -143,8 +143,8 @@ g_iconv_open (const gchar *to_codeset,
* @outbuf: converted output bytes
* @outbytes_left: inout parameter, bytes available to fill in @outbuf
*
* Same as the standard Unix routine <function>iconv()</function>, but
* may be implemented via libiconv on Unix flavors that lack
* Same as the standard UNIX routine <function>iconv()</function>, but
* may be implemented via libiconv on UNIX flavors that lack
* a native implementation.
*
* &GLib; provides g_convert() and g_locale_to_utf8() which are likely
......@@ -168,8 +168,8 @@ g_iconv (GIConv converter,
* g_iconv_close:
* @converter: a conversion descriptor from g_iconv_open()
*
* Same as the standard Unix routine <function>iconv_close()</function>, but
* may be implemented via libiconv on Unix flavors that lack
* Same as the standard UNIX routine <function>iconv_close()</function>, but
* may be implemented via libiconv on UNIX flavors that lack
* a native implementation. Should be called to clean up
* the conversion descriptor from g_iconv_open() when
* you are done converting things.
......
......@@ -716,7 +716,7 @@ g_io_channel_set_flags (GIOChannel *channel,
* The values of the flags %G_IO_FLAG_IS_READABLE and %G_IO_FLAG_IS_WRITEABLE
* are cached for internal use by the channel when it is created.
* If they should change at some later point (e.g. partial shutdown
* of a socket with the Unix <function>shutdown()</function> function), the user
* of a socket with the UNIX <function>shutdown()</function> function), the user
* should immediately call g_io_channel_get_flags () to update
* the internal values of these flags.
*
......
......@@ -1529,7 +1529,7 @@ g_source_remove_by_funcs_user_data (GSourceFuncs *funcs,
* g_get_current_time:
* @result: #GTimeVal structure in which to store current time.
*
* Equivalent to Unix's <function>gettimeofday()</function>, but portable
* Equivalent to the UNIX <function>gettimeofday()</function> function, but portable.
**/
void
g_get_current_time (GTimeVal *result)
......
......@@ -99,7 +99,7 @@ g_win32_ftruncate (gint fd,
* g_win32_getlocale:
*
* The setlocale in the Microsoft C library uses locale names of the
* form "English_United States.1252" etc. We want the Unixish standard
* form "English_United States.1252" etc. We want the UNIXish standard
* form "en_US", "zh_TW" etc. This function gets the current thread
* locale from Windows - without any encoding info - and returns it as
* a string of the above form for use in forming file names etc. The
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment