diff options
author | Matthias Clasen <matthiasc@src.gnome.org> | 2001-12-13 22:24:18 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2001-12-13 22:24:18 +0000 |
commit | a3d7806b6d2861d100bbd79934c2c010a9242808 (patch) | |
tree | ea2fa0bf580a3e2e9adeaac2dca630d351385309 /docs | |
parent | 9b83c28956be6084a38803ccfe124a2451239b5b (diff) | |
download | glib-a3d7806b6d2861d100bbd79934c2c010a9242808.tar.gz |
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.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/reference/ChangeLog | 12 | ||||
-rw-r--r-- | docs/reference/glib/tmpl/completion.sgml | 2 | ||||
-rw-r--r-- | docs/reference/glib/tmpl/date.sgml | 4 | ||||
-rw-r--r-- | docs/reference/glib/tmpl/fileutils.sgml | 4 | ||||
-rw-r--r-- | docs/reference/glib/tmpl/iochannels.sgml | 12 | ||||
-rw-r--r-- | docs/reference/glib/tmpl/macros.sgml | 12 | ||||
-rw-r--r-- | docs/reference/glib/tmpl/memory.sgml | 2 | ||||
-rw-r--r-- | docs/reference/glib/tmpl/memory_chunks.sgml | 2 | ||||
-rw-r--r-- | docs/reference/glib/tmpl/misc_utils.sgml | 6 | ||||
-rw-r--r-- | docs/reference/glib/tmpl/threads.sgml | 4 | ||||
-rw-r--r-- | docs/reference/glib/tmpl/warnings.sgml | 4 | ||||
-rw-r--r-- | docs/reference/glib/tmpl/windows.sgml | 14 |
12 files changed, 45 insertions, 33 deletions
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 <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. 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. <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(). 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. <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> 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. <!-- ##### 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. 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 <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. 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". <!-- ##### 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> 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. <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> 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 <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> 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: <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 (<!>) 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. </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. 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 <!-- ##### 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: |