diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2009-02-06 14:08:19 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2009-02-06 14:08:19 +0000 |
| commit | a431c976af52b02b63c642970a5e96a93bb5229b (patch) | |
| tree | ec552642a7544ac8211dd8711aac0f6380407657 | |
| parent | 58b1c089539e4470cab5598b939a002e77424639 (diff) | |
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
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gio/gdatainputstream.c | 2 | ||||
| -rw-r--r-- | gio/gfilterinputstream.c | 4 | ||||
| -rw-r--r-- | gio/gfilteroutputstream.c | 4 | ||||
| -rw-r--r-- | glib/gmarkup.c | 2 | ||||
| -rw-r--r-- | glib/gregex.c | 8 |
6 files changed, 19 insertions, 10 deletions
@@ -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 diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c index 387fede2f..3e8ce0e20 100644 --- a/gio/gdatainputstream.c +++ b/gio/gdatainputstream.c @@ -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 diff --git a/gio/gfilterinputstream.c b/gio/gfilterinputstream.c index 86d001ef5..aa27465dd 100644 --- a/gio/gfilterinputstream.c +++ b/gio/gfilterinputstream.c @@ -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)); } diff --git a/gio/gfilteroutputstream.c b/gio/gfilteroutputstream.c index 8706941c3..32fc6f7f2 100644 --- a/gio/gfilteroutputstream.c +++ b/gio/gfilteroutputstream.c @@ -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)); } diff --git a/glib/gmarkup.c b/glib/gmarkup.c index ccc762653..b1f4f465f 100644 --- a/glib/gmarkup.c +++ b/glib/gmarkup.c @@ -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, diff --git a/glib/gregex.c b/glib/gregex.c index ba9174af3..f92f0a98d 100644 --- a/glib/gregex.c +++ b/glib/gregex.c @@ -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 |