mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
Correct the grammar in some property documentation.
2009-02-06 Murray Cumming <murrayc@murrayc.com> * gio/gfilterinputstream.c: * gio/gfilteroutputstream.c: Correct the grammar in some property documentation. * gio/gdatainputstream.c: * glib/gregex.c: Correct the spelling of occurrence in documentation. svn path=/trunk/; revision=7856
This commit is contained in:
parent
58b1c08953
commit
a431c976af
@ -1,3 +1,12 @@
|
||||
2009-02-06 Murray Cumming <murrayc@murrayc.com>
|
||||
|
||||
* gio/gfilterinputstream.c:
|
||||
* gio/gfilteroutputstream.c: Correct the grammar in some property
|
||||
documentation.
|
||||
* gio/gdatainputstream.c:
|
||||
* glib/gregex.c: Correct the spelling of
|
||||
occurrence in documentation.
|
||||
|
||||
2009-02-02 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* configure.in: Bump version
|
||||
|
@ -861,7 +861,7 @@ scan_for_chars (GDataInputStream *stream,
|
||||
* @error: #GError for error reporting.
|
||||
*
|
||||
* Reads a string from the data input stream, up to the first
|
||||
* occurrance of any of the stop characters.
|
||||
* occurrence of any of the stop characters.
|
||||
*
|
||||
* Returns: a string with the data that was read before encountering
|
||||
* any of the stop characters. Set @length to a #gsize to get the length
|
||||
|
@ -132,7 +132,7 @@ g_filter_input_stream_class_init (GFilterInputStreamClass *klass)
|
||||
PROP_BASE_STREAM,
|
||||
g_param_spec_object ("base-stream",
|
||||
P_("The Filter Base Stream"),
|
||||
P_("The underlying base stream the io ops will be done on"),
|
||||
P_("The underlying base stream on which the io ops will be done."),
|
||||
G_TYPE_INPUT_STREAM,
|
||||
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
|
||||
G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
|
||||
@ -141,7 +141,7 @@ g_filter_input_stream_class_init (GFilterInputStreamClass *klass)
|
||||
PROP_CLOSE_BASE,
|
||||
g_param_spec_boolean ("close-base-stream",
|
||||
P_("Close Base Stream"),
|
||||
P_("If the base stream be closed when the filter stream is"),
|
||||
P_("If the base stream should be closed when the filter stream is closed."),
|
||||
TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
|
||||
G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
|
||||
}
|
||||
|
@ -131,7 +131,7 @@ g_filter_output_stream_class_init (GFilterOutputStreamClass *klass)
|
||||
PROP_BASE_STREAM,
|
||||
g_param_spec_object ("base-stream",
|
||||
P_("The Filter Base Stream"),
|
||||
P_("The underlying base stream the io ops will be done on"),
|
||||
P_("The underlying base stream on which the io ops will be done."),
|
||||
G_TYPE_OUTPUT_STREAM,
|
||||
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
|
||||
G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
|
||||
@ -140,7 +140,7 @@ g_filter_output_stream_class_init (GFilterOutputStreamClass *klass)
|
||||
PROP_CLOSE_BASE,
|
||||
g_param_spec_boolean ("close-base-stream",
|
||||
P_("Close Base Stream"),
|
||||
P_("If the base stream be closed when the filter stream is"),
|
||||
P_("If the base stream should be closed when the filter stream is closed."),
|
||||
TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
|
||||
G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
|
||||
}
|
||||
|
@ -2930,7 +2930,7 @@ g_markup_collect_attributes (const gchar *element_name,
|
||||
/* duplicate! */
|
||||
break;
|
||||
|
||||
/* j is now the first occurance of attribute_names[i] */
|
||||
/* j is now the first occurrence of attribute_names[i] */
|
||||
if (i == j)
|
||||
g_set_error (error, G_MARKUP_ERROR,
|
||||
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
|
||||
|
@ -2379,7 +2379,7 @@ interpolation_list_needs_match (GList *list)
|
||||
* @match_options: options for the match
|
||||
* @error: location to store the error occuring, or %NULL to ignore errors
|
||||
*
|
||||
* Replaces all occurances of the pattern in @regex with the
|
||||
* Replaces all occurrences of the pattern in @regex with the
|
||||
* replacement text. Backreferences of the form '\number' or
|
||||
* '\g<number>' in the replacement text are interpolated by the
|
||||
* number-th captured subexpression of the match, '\g<name>' refers
|
||||
@ -2491,7 +2491,7 @@ literal_replacement (const GMatchInfo *match_info,
|
||||
* @match_options: options for the match
|
||||
* @error: location to store the error occuring, or %NULL to ignore errors
|
||||
*
|
||||
* Replaces all occurances of the pattern in @regex with the
|
||||
* Replaces all occurrences of the pattern in @regex with the
|
||||
* replacement text. @replacement is replaced literally, to
|
||||
* include backreferences use g_regex_replace().
|
||||
*
|
||||
@ -2535,8 +2535,8 @@ g_regex_replace_literal (const GRegex *regex,
|
||||
* @user_data: user data to pass to the function
|
||||
* @error: location to store the error occuring, or %NULL to ignore errors
|
||||
*
|
||||
* Replaces occurances of the pattern in regex with the output of
|
||||
* @eval for that occurance.
|
||||
* Replaces occurrences of the pattern in regex with the output of
|
||||
* @eval for that occurrence.
|
||||
*
|
||||
* Setting @start_position differs from just passing over a shortened
|
||||
* string and setting #G_REGEX_MATCH_NOTBOL in the case of a pattern
|
||||
|
Loading…
Reference in New Issue
Block a user