From a3d7806b6d2861d100bbd79934c2c010a9242808 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 13 Dec 2001 22:24:18 +0000 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ docs/reference/ChangeLog | 12 ++++++++++++ docs/reference/glib/tmpl/completion.sgml | 2 +- docs/reference/glib/tmpl/date.sgml | 4 ++-- docs/reference/glib/tmpl/fileutils.sgml | 4 ++-- docs/reference/glib/tmpl/iochannels.sgml | 12 ++++++------ docs/reference/glib/tmpl/macros.sgml | 12 ++++++------ docs/reference/glib/tmpl/memory.sgml | 2 +- docs/reference/glib/tmpl/memory_chunks.sgml | 2 +- docs/reference/glib/tmpl/misc_utils.sgml | 6 +++--- docs/reference/glib/tmpl/threads.sgml | 4 ++-- docs/reference/glib/tmpl/warnings.sgml | 4 ++-- docs/reference/glib/tmpl/windows.sgml | 14 +++++++------- glib/gconvert.c | 12 ++++++------ glib/giochannel.c | 2 +- glib/gmain.c | 2 +- glib/gwin32.c | 2 +- 24 files changed, 94 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index 833b2363f..2c5b889de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-12-13 Matthias Clasen + + * 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 * glib/gbsearcharray.[hc]: API revamp to shorten GValueArray diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 833b2363f..2c5b889de 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-12-13 Matthias Clasen + + * 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 * glib/gbsearcharray.[hc]: API revamp to shorten GValueArray diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 833b2363f..2c5b889de 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-12-13 Matthias Clasen + + * 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 * glib/gbsearcharray.[hc]: API revamp to shorten GValueArray diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 833b2363f..2c5b889de 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2001-12-13 Matthias Clasen + + * 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 * glib/gbsearcharray.[hc]: API revamp to shorten GValueArray diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 833b2363f..2c5b889de 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-12-13 Matthias Clasen + + * 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 * glib/gbsearcharray.[hc]: API revamp to shorten GValueArray diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 833b2363f..2c5b889de 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-12-13 Matthias Clasen + + * 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 * glib/gbsearcharray.[hc]: API revamp to shorten GValueArray diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 833b2363f..2c5b889de 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-12-13 Matthias Clasen + + * 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 * glib/gbsearcharray.[hc]: API revamp to shorten GValueArray diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 833b2363f..2c5b889de 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-12-13 Matthias Clasen + + * 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 * glib/gbsearcharray.[hc]: API revamp to shorten GValueArray diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 191959ffd..d4b5b1d08 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,15 @@ +2001-12-13 Matthias Clasen + + * 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 * glib/tmpl/string_utils.sgml: Correct docs for g_[v]snprintf. diff --git a/docs/reference/glib/tmpl/completion.sgml b/docs/reference/glib/tmpl/completion.sgml index 4a0cd6b78..89c09e3cc 100644 --- a/docs/reference/glib/tmpl/completion.sgml +++ b/docs/reference/glib/tmpl/completion.sgml @@ -8,7 +8,7 @@ support for automatic completion using a group of target strings. #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. A #GCompletion is created using g_completion_new(). diff --git a/docs/reference/glib/tmpl/date.sgml b/docs/reference/glib/tmpl/date.sgml index 5b27683a7..0f6bf0b8b 100644 --- a/docs/reference/glib/tmpl/date.sgml +++ b/docs/reference/glib/tmpl/date.sgml @@ -75,7 +75,7 @@ code readability. Represents a precise time, with seconds and microseconds. Same as the struct timeval returned by the -gettimeofday() Unix call. +gettimeofday() UNIX call. @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 (time_t) value. To set the value of a date to the current day, you could write: -g_date_set_time(date, time(NULL)); +g_date_set_time (date, time (NULL)); diff --git a/docs/reference/glib/tmpl/fileutils.sgml b/docs/reference/glib/tmpl/fileutils.sgml index 9d71dedb1..c9ae8e8b5 100644 --- a/docs/reference/glib/tmpl/fileutils.sgml +++ b/docs/reference/glib/tmpl/fileutils.sgml @@ -17,9 +17,9 @@ various file-related functions. Values corresponding to errno codes returned from file operations -on Unix. Unlike errno codes, #GFileError values are available on +on UNIX. Unlike errno 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. diff --git a/docs/reference/glib/tmpl/iochannels.sgml b/docs/reference/glib/tmpl/iochannels.sgml index 31667b85c..96e9cd400 100644 --- a/docs/reference/glib/tmpl/iochannels.sgml +++ b/docs/reference/glib/tmpl/iochannels.sgml @@ -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 main event loop. -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. -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. 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. The returned #GIOChannel has a reference count of 1. @@ -93,7 +93,7 @@ The returned #GIOChannel has a reference count of 1. -Returns the file descriptor of the Unix #GIOChannel. +Returns the file descriptor of the UNIX #GIOChannel. @channel: a #GIOChannel, created with g_io_channel_unix_new(). @@ -449,9 +449,9 @@ g_io_channel_set_flags(). @G_IO_FLAG_APPEND: turns on append mode, corresponds to %O_APPEND (see the - documentation of the Unix open() syscall). + documentation of the UNIX open() 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 open() syscall). @G_IO_FLAG_IS_READABLE: indicates that the io channel is readable. This flag can not be changed. diff --git a/docs/reference/glib/tmpl/macros.sgml b/docs/reference/glib/tmpl/macros.sgml index c272600c2..37a6fe7a5 100644 --- a/docs/reference/glib/tmpl/macros.sgml +++ b/docs/reference/glib/tmpl/macros.sgml @@ -53,8 +53,8 @@ BeOS-specific code in "#ifdef G_OS_BEOS". -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". @@ -82,7 +82,7 @@ version. The directory separator character. -This is '/' on Unix machines and '\' under Windows. +This is '/' on UNIX machines and '\' under Windows. @@ -90,7 +90,7 @@ This is '/' on Unix machines and '\' under Windows. The directory separator as a string. -This is "/" on Unix machines and "\" under Windows. +This is "/" on UNIX machines and "\" under Windows. @@ -98,7 +98,7 @@ This is "/" on Unix machines and "\" under Windows. The search path separator character. -This is ':' on Unix machines and ';' under Windows. +This is ':' on UNIX machines and ';' under Windows. @@ -106,7 +106,7 @@ This is ':' on Unix machines and ';' under Windows. The search path separator as a string. -This is ":" on Unix machines and ";" under Windows. +This is ":" on UNIX machines and ";" under Windows. diff --git a/docs/reference/glib/tmpl/memory.sgml b/docs/reference/glib/tmpl/memory.sgml index f83043fa9..4c0b2c124 100644 --- a/docs/reference/glib/tmpl/memory.sgml +++ b/docs/reference/glib/tmpl/memory.sgml @@ -125,7 +125,7 @@ If @mem is %NULL it simply returns. 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 -alloca() function present on most Unix variants. +alloca() function present on most UNIX variants. Thus it provides the same advantages and pitfalls as alloca(): diff --git a/docs/reference/glib/tmpl/memory_chunks.sgml b/docs/reference/glib/tmpl/memory_chunks.sgml index c089a0850..ad44e217c 100644 --- a/docs/reference/glib/tmpl/memory_chunks.sgml +++ b/docs/reference/glib/tmpl/memory_chunks.sgml @@ -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. */ diff --git a/docs/reference/glib/tmpl/misc_utils.sgml b/docs/reference/glib/tmpl/misc_utils.sgml index 4540eeb6f..c717c9b2b 100644 --- a/docs/reference/glib/tmpl/misc_utils.sgml +++ b/docs/reference/glib/tmpl/misc_utils.sgml @@ -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 TMPDIR, TMP, and TEMP -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. @@ -124,7 +124,7 @@ The returned string should be freed when no longer needed. 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. @file_name: a file name. @@ -134,7 +134,7 @@ on Unix or 'C:\windows' on Windows systems. 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. diff --git a/docs/reference/glib/tmpl/threads.sgml b/docs/reference/glib/tmpl/threads.sgml index 99060d4a1..5d9220662 100644 --- a/docs/reference/glib/tmpl/threads.sgml +++ b/docs/reference/glib/tmpl/threads.sgml @@ -510,12 +510,12 @@ not use such constructs in your own programs. One working solution is: 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 () diff --git a/docs/reference/glib/tmpl/warnings.sgml b/docs/reference/glib/tmpl/warnings.sgml index bcce91c9b..0ae921e82 100644 --- a/docs/reference/glib/tmpl/warnings.sgml +++ b/docs/reference/glib/tmpl/warnings.sgml @@ -172,7 +172,7 @@ The prompt is then shown again. If [P]roceed is selected, the function returns. -This function may cause different actions on non-Unix platforms. +This function may cause different actions on non-UNIX platforms. @prg_name: the program name, needed by gdb for the [S]tack trace option. @@ -186,7 +186,7 @@ Invokes gdb, which attaches to the current process and shows Called by g_on_error_query() when the [S]tack trace option is selected. -This function may cause different actions on non-Unix platforms. +This function may cause different actions on non-UNIX platforms. @prg_name: the program name, needed by gdb for the [S]tack trace option. diff --git a/docs/reference/glib/tmpl/windows.sgml b/docs/reference/glib/tmpl/windows.sgml index 26a92d836..0d1faa109 100644 --- a/docs/reference/glib/tmpl/windows.sgml +++ b/docs/reference/glib/tmpl/windows.sgml @@ -2,7 +2,7 @@ Windows Compatibility Functions -Unix emulation on Windows. +UNIX emulation on Windows. @@ -16,7 +16,7 @@ Unix emulation on Windows. -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). @@ -25,14 +25,14 @@ macro %MAXPATHLEN, which is the maximum length of a filename -Provided for Unix emulation on Windows; process ID type. +Provided for UNIX emulation on Windows; process ID type. -Provided for Unix emulation on Windows; see documentation for pipe() -in any Unix manual. +Provided for UNIX emulation on Windows; see documentation for pipe() +in any UNIX manual. @phandles: @@ -40,8 +40,8 @@ in any Unix manual. -Provided for Unix emulation on Windows; see documentation for ftruncate() -in any Unix manual. +Provided for UNIX emulation on Windows; see documentation for ftruncate() +in any UNIX manual. @fd: diff --git a/glib/gconvert.c b/glib/gconvert.c index be4bf1ea2..e95b767a4 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -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 iconv_open(), but - * may be implemented via libiconv on Unix flavors that lack + * Same as the standard UNIX routine iconv_open(), 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 iconv(), but - * may be implemented via libiconv on Unix flavors that lack + * Same as the standard UNIX routine iconv(), 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 iconv_close(), but - * may be implemented via libiconv on Unix flavors that lack + * Same as the standard UNIX routine iconv_close(), 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. diff --git a/glib/giochannel.c b/glib/giochannel.c index 69036d77c..5beba7e4c 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -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 shutdown() function), the user + * of a socket with the UNIX shutdown() function), the user * should immediately call g_io_channel_get_flags () to update * the internal values of these flags. * diff --git a/glib/gmain.c b/glib/gmain.c index 5b7d92061..827ce097a 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -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 gettimeofday(), but portable + * Equivalent to the UNIX gettimeofday() function, but portable. **/ void g_get_current_time (GTimeVal *result) diff --git a/glib/gwin32.c b/glib/gwin32.c index 13fd2b8af..2f977857c 100644 --- a/glib/gwin32.c +++ b/glib/gwin32.c @@ -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