discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=27920d31c19bfa2b1f2fe9a30f713db709657941
commit 27920d31c19bfa2b1f2fe9a30f713db709657941 Author: Bryce Harrington <[email protected]> Date: Wed Mar 18 21:37:47 2015 -0400 Spelling fixes Summary: emmited ==> emitted resistence ==> resistance occured ==> occurred Reviewers: cedric, zmike, devilhorns Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2192 --- data/ecore/ecore_wayland/protocol/subsurface.xml | 2 +- doc/edje_examples.dox | 2 +- doc/eio_examples.dox | 8 ++++---- doc/ephysics_examples.dox | 2 +- src/examples/edje/edje-box.c | 8 ++++---- src/lib/ecore_audio/Ecore_Audio.h | 2 +- src/lib/edje/edje_text.c | 2 +- src/lib/escape/sys/mman.h | 2 +- src/lib/evas/cserve2/evas_cs2_client.c | 2 +- src/lib/evil/dlfcn.h | 2 +- src/lib/evil/sys/mman.h | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data/ecore/ecore_wayland/protocol/subsurface.xml b/data/ecore/ecore_wayland/protocol/subsurface.xml index 9e4a658..1b8bcb1 100644 --- a/data/ecore/ecore_wayland/protocol/subsurface.xml +++ b/data/ecore/ecore_wayland/protocol/subsurface.xml @@ -201,7 +201,7 @@ <request name="set_sync"> <description summary="set sub-surface to synchronized mode"> Change the commit behaviour of the sub-surface to synchronized - mode, also described as the parent dependant mode. + mode, also described as the parent dependent mode. In synchronized mode, wl_surface.commit on a sub-surface will accumulate the committed state in a cache, but the state will diff --git a/doc/edje_examples.dox b/doc/edje_examples.dox index c15dfb6..30722ba 100644 --- a/doc/edje_examples.dox +++ b/doc/edje_examples.dox @@ -878,7 +878,7 @@ * * There are two other things that are worth mentioning, we added two callbacks for the * objects, one for mouse down (that we use to delete the color class) and another - * for the signal emmited when a color class is deleted. + * for the signal emitted when a color class is deleted. * @skip evas_object_event * @until NULL * @skip edje_object_si diff --git a/doc/eio_examples.dox b/doc/eio_examples.dox index a0f1325..4b7c1ed 100644 --- a/doc/eio_examples.dox +++ b/doc/eio_examples.dox @@ -24,7 +24,7 @@ * @li The notification callback, which allows you to know if a file or * a directory is copied, and the progress of the copy. * @li The end callback, which is called when the copy is finished. - * @li The error callback, which is called if an error occured. You + * @li The error callback, which is called if an error occurred. You * can then retrieve the error type as an errno error. * * @warning It is the user's duty to provide the "right target". It @@ -107,7 +107,7 @@ * @li The end callback, which is called in the main loop when the * content of the directory has been correctly scanned and all the * file notified to the main loop. - * @li The error callback, which is called if an error occured or + * @li The error callback, which is called if an error occurred or * if the listing was cancelled during it's run. You can then retrieve * the error type as an errno error. * @@ -190,7 +190,7 @@ * @li The end callback, which is called in the main loop when the * content of the directory has been correctly scanned and all the * file notified to the main loop. - * @li The error callback, which is called if an error occured or + * @li The error callback, which is called if an error occurred or * if the listing was cancelled during it's run. You can then retrieve * the error type as an errno error. * @@ -331,7 +331,7 @@ * @li The end callback, which is called in the main loop when the * content of the directory has been correctly scanned and all the * file notified to the main loop. - * @li The error callback, which is called if an error occured or + * @li The error callback, which is called if an error occurred or * if the listing was cancelled during it's run. You can then retrieve * the error type as an errno error. * diff --git a/doc/ephysics_examples.dox b/doc/ephysics_examples.dox index 77629a7..cddf3c8 100644 --- a/doc/ephysics_examples.dox +++ b/doc/ephysics_examples.dox @@ -1659,7 +1659,7 @@ * * Here we set EPhysics_Bodys linear and angular damping values.The damping is * a force synchronous with the velocity of the object but in opposite - * direction - like air resistence. + * direction - like air resistance. * * @skipline ephysics_body_damping_set(sphere_body1 * diff --git a/src/examples/edje/edje-box.c b/src/examples/edje/edje-box.c index 978a530..a36a5a5 100644 --- a/src/examples/edje/edje-box.c +++ b/src/examples/edje/edje-box.c @@ -92,7 +92,7 @@ _on_rect_mouse_down(void *data, Evas *e, Evas_Object *o, void *event_info) printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect); r = edje_object_part_box_insert_before(edje_obj, "example/box", rect, o); if (!r) - printf("An error ocurred when appending rect %p to the box.\n", rect); + printf("An error occurred when appending rect %p to the box.\n", rect); evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL); } @@ -126,7 +126,7 @@ _on_bg_key_down(void *data, Evas *e, Evas_Object *o EINA_UNUSED, void *event_inf printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect); r = edje_object_part_box_insert_at(edje_obj, "example/box", rect, 0); if (!r) - printf("An error ocurred when appending rect %p to the box.\n", rect); + printf("An error occurred when appending rect %p to the box.\n", rect); evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL); } @@ -140,7 +140,7 @@ _on_bg_key_down(void *data, Evas *e, Evas_Object *o EINA_UNUSED, void *event_inf printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect); r = edje_object_part_box_append(edje_obj, "example/box", rect); if (!r) - printf("An error ocurred when appending rect %p to the box.\n", rect); + printf("An error occurred when appending rect %p to the box.\n", rect); evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL); } @@ -209,7 +209,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) evas_object_resize(rect, RECTW, RECTH); r = edje_object_part_box_append(edje_obj, "example/box", rect); if (!r) - printf("An error ocurred when appending rect #%d to the box.\n", i); + printf("An error occurred when appending rect #%d to the box.\n", i); evas_object_show(rect); evas_object_event_callback_add( diff --git a/src/lib/ecore_audio/Ecore_Audio.h b/src/lib/ecore_audio/Ecore_Audio.h index dda0c1b..0835d6d 100644 --- a/src/lib/ecore_audio/Ecore_Audio.h +++ b/src/lib/ecore_audio/Ecore_Audio.h @@ -110,7 +110,7 @@ struct _Ecore_Audio_Vio { * SEEK_END: offset is relative to the end * * @return The resulting position from the start of the file (in bytes) - * or -1 if an error occured (i.e. out of bounds) + * or -1 if an error occurred (i.e. out of bounds) * * @since 1.8 */ diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c index c180122..e95feb5 100644 --- a/src/lib/edje/edje_text.c +++ b/src/lib/edje/edje_text.c @@ -443,7 +443,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, * this was moderately okay for a time because nobody was using it or GROUP parts * with text in them very frequently, and so nobody noticed that the mismatch was breaking * sizing in some cases when the edje ellipsis value failed to be applied, - * which ocurred any time text.min_x was set; in this case, ellipsis would NEVER be + * which occurred any time text.min_x was set; in this case, ellipsis would NEVER be * correctly applied, and instead the text object would only ever get the first * ellipsis_set(0), permanently breaking the part. * the only way to fix this while preserving previous behavior was to bump diff --git a/src/lib/escape/sys/mman.h b/src/lib/escape/sys/mman.h index b243c15..aebbbc9 100644 --- a/src/lib/escape/sys/mman.h +++ b/src/lib/escape/sys/mman.h @@ -97,7 +97,7 @@ extern "C" { * If the map view of file can not be created, -1 is returned. * If the mappping can not be done, -1 is returned. * - * If no error occured, the starting address of the mapped view + * If no error occurred, the starting address of the mapped view * is returned. * * Conformity: None. diff --git a/src/lib/evas/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c index 2471c1f..bdea591 100644 --- a/src/lib/evas/cserve2/evas_cs2_client.c +++ b/src/lib/evas/cserve2/evas_cs2_client.c @@ -2140,7 +2140,7 @@ _glyph_request_cb(void *data, const void *msg, int size) return EINA_TRUE; end: - ERR("An unknown error occured when waiting for glyph data!"); + ERR("An unknown error occurred when waiting for glyph data!"); free(grd); return EINA_TRUE; } diff --git a/src/lib/evil/dlfcn.h b/src/lib/evil/dlfcn.h index d85811a..21de0b8 100644 --- a/src/lib/evil/dlfcn.h +++ b/src/lib/evil/dlfcn.h @@ -224,7 +224,7 @@ EAPI int dladdr (const void *addr, Dl_info *info); /** * @brief Get diagnostic information * - * @return A @c NULL-terminated string if an error occured, @c NULL + * @return A @c NULL-terminated string if an error occurred, @c NULL * otherwise. * * Return a @c NULL-terminated character string describing the last diff --git a/src/lib/evil/sys/mman.h b/src/lib/evil/sys/mman.h index 3c63536..575f126 100644 --- a/src/lib/evil/sys/mman.h +++ b/src/lib/evil/sys/mman.h @@ -102,7 +102,7 @@ extern "C" { * If the map view of file can not be created, -1 is returned. * If the mappping can not be done, -1 is returned. * - * If no error occured, the starting address of the mapped view + * If no error occurred, the starting address of the mapped view * is returned. * * Conformity: None. --
