summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Harrington <bryce@osg.samsung.com>2015-03-18 21:37:47 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-03-18 21:38:33 -0400
commit27920d31c19bfa2b1f2fe9a30f713db709657941 (patch)
tree08f6588b943f6bcac73bec49fc0fdf541de5399a
parent5a0588c256f82ceac33927c3f0cb2db183a1debc (diff)
Spelling fixes
Summary: emmited ==> emitted resistence ==> resistance occured ==> occurred Reviewers: cedric, zmike, devilhorns Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2192
-rw-r--r--data/ecore/ecore_wayland/protocol/subsurface.xml2
-rw-r--r--doc/edje_examples.dox2
-rw-r--r--doc/eio_examples.dox8
-rw-r--r--doc/ephysics_examples.dox2
-rw-r--r--src/examples/edje/edje-box.c8
-rw-r--r--src/lib/ecore_audio/Ecore_Audio.h2
-rw-r--r--src/lib/edje/edje_text.c2
-rw-r--r--src/lib/escape/sys/mman.h2
-rw-r--r--src/lib/evas/cserve2/evas_cs2_client.c2
-rw-r--r--src/lib/evil/dlfcn.h2
-rw-r--r--src/lib/evil/sys/mman.h2
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 @@
201 <request name="set_sync"> 201 <request name="set_sync">
202 <description summary="set sub-surface to synchronized mode"> 202 <description summary="set sub-surface to synchronized mode">
203 Change the commit behaviour of the sub-surface to synchronized 203 Change the commit behaviour of the sub-surface to synchronized
204 mode, also described as the parent dependant mode. 204 mode, also described as the parent dependent mode.
205 205
206 In synchronized mode, wl_surface.commit on a sub-surface will 206 In synchronized mode, wl_surface.commit on a sub-surface will
207 accumulate the committed state in a cache, but the state will 207 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 @@
878 * 878 *
879 * There are two other things that are worth mentioning, we added two callbacks for the 879 * There are two other things that are worth mentioning, we added two callbacks for the
880 * objects, one for mouse down (that we use to delete the color class) and another 880 * objects, one for mouse down (that we use to delete the color class) and another
881 * for the signal emmited when a color class is deleted. 881 * for the signal emitted when a color class is deleted.
882 * @skip evas_object_event 882 * @skip evas_object_event
883 * @until NULL 883 * @until NULL
884 * @skip edje_object_si 884 * @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 @@
24 * @li The notification callback, which allows you to know if a file or 24 * @li The notification callback, which allows you to know if a file or
25 * a directory is copied, and the progress of the copy. 25 * a directory is copied, and the progress of the copy.
26 * @li The end callback, which is called when the copy is finished. 26 * @li The end callback, which is called when the copy is finished.
27 * @li The error callback, which is called if an error occured. You 27 * @li The error callback, which is called if an error occurred. You
28 * can then retrieve the error type as an errno error. 28 * can then retrieve the error type as an errno error.
29 * 29 *
30 * @warning It is the user's duty to provide the "right target". It 30 * @warning It is the user's duty to provide the "right target". It
@@ -107,7 +107,7 @@
107 * @li The end callback, which is called in the main loop when the 107 * @li The end callback, which is called in the main loop when the
108 * content of the directory has been correctly scanned and all the 108 * content of the directory has been correctly scanned and all the
109 * file notified to the main loop. 109 * file notified to the main loop.
110 * @li The error callback, which is called if an error occured or 110 * @li The error callback, which is called if an error occurred or
111 * if the listing was cancelled during it's run. You can then retrieve 111 * if the listing was cancelled during it's run. You can then retrieve
112 * the error type as an errno error. 112 * the error type as an errno error.
113 * 113 *
@@ -190,7 +190,7 @@
190 * @li The end callback, which is called in the main loop when the 190 * @li The end callback, which is called in the main loop when the
191 * content of the directory has been correctly scanned and all the 191 * content of the directory has been correctly scanned and all the
192 * file notified to the main loop. 192 * file notified to the main loop.
193 * @li The error callback, which is called if an error occured or 193 * @li The error callback, which is called if an error occurred or
194 * if the listing was cancelled during it's run. You can then retrieve 194 * if the listing was cancelled during it's run. You can then retrieve
195 * the error type as an errno error. 195 * the error type as an errno error.
196 * 196 *
@@ -331,7 +331,7 @@
331 * @li The end callback, which is called in the main loop when the 331 * @li The end callback, which is called in the main loop when the
332 * content of the directory has been correctly scanned and all the 332 * content of the directory has been correctly scanned and all the
333 * file notified to the main loop. 333 * file notified to the main loop.
334 * @li The error callback, which is called if an error occured or 334 * @li The error callback, which is called if an error occurred or
335 * if the listing was cancelled during it's run. You can then retrieve 335 * if the listing was cancelled during it's run. You can then retrieve
336 * the error type as an errno error. 336 * the error type as an errno error.
337 * 337 *
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 @@
1659 * 1659 *
1660 * Here we set EPhysics_Bodys linear and angular damping values.The damping is 1660 * Here we set EPhysics_Bodys linear and angular damping values.The damping is
1661 * a force synchronous with the velocity of the object but in opposite 1661 * a force synchronous with the velocity of the object but in opposite
1662 * direction - like air resistence. 1662 * direction - like air resistance.
1663 * 1663 *
1664 * @skipline ephysics_body_damping_set(sphere_body1 1664 * @skipline ephysics_body_damping_set(sphere_body1
1665 * 1665 *
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)
92 printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect); 92 printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect);
93 r = edje_object_part_box_insert_before(edje_obj, "example/box", rect, o); 93 r = edje_object_part_box_insert_before(edje_obj, "example/box", rect, o);
94 if (!r) 94 if (!r)
95 printf("An error ocurred when appending rect %p to the box.\n", rect); 95 printf("An error occurred when appending rect %p to the box.\n", rect);
96 96
97 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL); 97 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
98 } 98 }
@@ -126,7 +126,7 @@ _on_bg_key_down(void *data, Evas *e, Evas_Object *o EINA_UNUSED, void *event_inf
126 printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect); 126 printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect);
127 r = edje_object_part_box_insert_at(edje_obj, "example/box", rect, 0); 127 r = edje_object_part_box_insert_at(edje_obj, "example/box", rect, 0);
128 if (!r) 128 if (!r)
129 printf("An error ocurred when appending rect %p to the box.\n", rect); 129 printf("An error occurred when appending rect %p to the box.\n", rect);
130 130
131 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL); 131 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
132 } 132 }
@@ -140,7 +140,7 @@ _on_bg_key_down(void *data, Evas *e, Evas_Object *o EINA_UNUSED, void *event_inf
140 printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect); 140 printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect);
141 r = edje_object_part_box_append(edje_obj, "example/box", rect); 141 r = edje_object_part_box_append(edje_obj, "example/box", rect);
142 if (!r) 142 if (!r)
143 printf("An error ocurred when appending rect %p to the box.\n", rect); 143 printf("An error occurred when appending rect %p to the box.\n", rect);
144 144
145 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL); 145 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
146 } 146 }
@@ -209,7 +209,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
209 evas_object_resize(rect, RECTW, RECTH); 209 evas_object_resize(rect, RECTW, RECTH);
210 r = edje_object_part_box_append(edje_obj, "example/box", rect); 210 r = edje_object_part_box_append(edje_obj, "example/box", rect);
211 if (!r) 211 if (!r)
212 printf("An error ocurred when appending rect #%d to the box.\n", i); 212 printf("An error occurred when appending rect #%d to the box.\n", i);
213 evas_object_show(rect); 213 evas_object_show(rect);
214 214
215 evas_object_event_callback_add( 215 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 {
110 * SEEK_END: offset is relative to the end 110 * SEEK_END: offset is relative to the end
111 * 111 *
112 * @return The resulting position from the start of the file (in bytes) 112 * @return The resulting position from the start of the file (in bytes)
113 * or -1 if an error occured (i.e. out of bounds) 113 * or -1 if an error occurred (i.e. out of bounds)
114 * 114 *
115 * @since 1.8 115 * @since 1.8
116 */ 116 */
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,
443 * this was moderately okay for a time because nobody was using it or GROUP parts 443 * this was moderately okay for a time because nobody was using it or GROUP parts
444 * with text in them very frequently, and so nobody noticed that the mismatch was breaking 444 * with text in them very frequently, and so nobody noticed that the mismatch was breaking
445 * sizing in some cases when the edje ellipsis value failed to be applied, 445 * sizing in some cases when the edje ellipsis value failed to be applied,
446 * which ocurred any time text.min_x was set; in this case, ellipsis would NEVER be 446 * which occurred any time text.min_x was set; in this case, ellipsis would NEVER be
447 * correctly applied, and instead the text object would only ever get the first 447 * correctly applied, and instead the text object would only ever get the first
448 * ellipsis_set(0), permanently breaking the part. 448 * ellipsis_set(0), permanently breaking the part.
449 * the only way to fix this while preserving previous behavior was to bump 449 * 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" {
97 * If the map view of file can not be created, -1 is returned. 97 * If the map view of file can not be created, -1 is returned.
98 * If the mappping can not be done, -1 is returned. 98 * If the mappping can not be done, -1 is returned.
99 * 99 *
100 * If no error occured, the starting address of the mapped view 100 * If no error occurred, the starting address of the mapped view
101 * is returned. 101 * is returned.
102 * 102 *
103 * Conformity: None. 103 * 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)
2140 return EINA_TRUE; 2140 return EINA_TRUE;
2141 2141
2142end: 2142end:
2143 ERR("An unknown error occured when waiting for glyph data!"); 2143 ERR("An unknown error occurred when waiting for glyph data!");
2144 free(grd); 2144 free(grd);
2145 return EINA_TRUE; 2145 return EINA_TRUE;
2146} 2146}
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);
224/** 224/**
225 * @brief Get diagnostic information 225 * @brief Get diagnostic information
226 * 226 *
227 * @return A @c NULL-terminated string if an error occured, @c NULL 227 * @return A @c NULL-terminated string if an error occurred, @c NULL
228 * otherwise. 228 * otherwise.
229 * 229 *
230 * Return a @c NULL-terminated character string describing the last 230 * 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" {
102 * If the map view of file can not be created, -1 is returned. 102 * If the map view of file can not be created, -1 is returned.
103 * If the mappping can not be done, -1 is returned. 103 * If the mappping can not be done, -1 is returned.
104 * 104 *
105 * If no error occured, the starting address of the mapped view 105 * If no error occurred, the starting address of the mapped view
106 * is returned. 106 * is returned.
107 * 107 *
108 * Conformity: None. 108 * Conformity: None.