[Emc-commit] emc2/src/hal/utils scope.c,1.9,1.10 scope_rt.c,1.1,1.2 scope_rt.h,1.1,1.2 scope_shm.h,1.1,1.2 scope_usr.h,1.8,1.9

[EMC C. s. <cv...@cv...>]

Modified file emc2/src/hal/utils/scope.c

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope.c?rev=1.10>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope.c.diff?r1=1.9;r2=1.10>

Branch: HEAD

Log:
revision 1.10
date: 2006/05/01 17:15:43;  author: swpadnos;  state: Exp;  lines: +2 -2
Fix typos in the word "Oscilloscope"

--- scope.c	2006/03/19 22:05:40	1.9
+++ scope.c	2006/05/01 17:15:43	1.10
@@ -1,5 +1,5 @@
 /** This file, 'scope.c', is a GUI program that together with
-    'scope_rt.c' serves as an oscilliscope to examine HAL pins,
+    'scope_rt.c' serves as an oscilloscope to examine HAL pins,
     signals, and parameters.  It is a user space component and
     uses GTK 1.2 or 2.0 for the GUI code.
 */
@@ -417,7 +417,7 @@
     /* allow the user to expand it */
     gtk_window_set_policy(GTK_WINDOW(ctrl_usr->main_win), FALSE, TRUE, FALSE);
     /* set main window title */
-    gtk_window_set_title(GTK_WINDOW(ctrl_usr->main_win), "HAL Oscilliscope");
+    gtk_window_set_title(GTK_WINDOW(ctrl_usr->main_win), "HAL Oscilloscope");
 
     /* top level - one big hbox */
     hbox = gtk_hbox_new(FALSE, 0);

Modified file emc2/src/hal/utils/scope_rt.c

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_rt.c?rev=1.2>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_rt.c.diff?r1=1.1;r2=1.2>

Branch: HEAD

Log:
revision 1.2
date: 2006/05/01 17:15:43;  author: swpadnos;  state: Exp;  lines: +2 -2
Fix typos in the word "Oscilloscope"

--- scope_rt.c	2004/03/08 04:37:14	1.1
+++ scope_rt.c	2006/05/01 17:15:43	1.2
@@ -1,5 +1,5 @@
 /** This file, 'halscope_rt.c', is a HAL component that together with
-    'halscope.c' provides an oscilliscope to view HAL pins, signals,
+    'halscope.c' provides an oscilloscope to view HAL pins, signals,
     and parameters
 */
 
@@ -45,7 +45,7 @@
 #ifdef MODULE
 /* module information */
 MODULE_AUTHOR("John Kasunich");
-MODULE_DESCRIPTION("Oscilliscope for EMC HAL");
+MODULE_DESCRIPTION("Oscilloscope for EMC HAL");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif /* MODULE_LICENSE */

Modified file emc2/src/hal/utils/scope_rt.h

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_rt.h?rev=1.2>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_rt.h.diff?r1=1.1;r2=1.2>

Branch: HEAD

Log:
revision 1.2
date: 2006/05/01 17:15:43;  author: swpadnos;  state: Exp;  lines: +1 -1
Fix typos in the word "Oscilloscope"

--- scope_rt.h	2004/03/08 04:37:14	1.1
+++ scope_rt.h	2006/05/01 17:15:43	1.2
@@ -2,7 +2,7 @@
 #define HALSC_RT_H
 /** This file, 'halsc_rt.h', contains declarations used by
     'halscope_rt.c' to implement the real-time portion of
-    the HAL oscilliscope.  Declarations that are common to the
+    the HAL oscilloscope.  Declarations that are common to the
     realtime and user parts are in 'halsc_shm.h', and those used
     only by the user part are in 'halsc_usr.h'.
 */

Modified file emc2/src/hal/utils/scope_shm.h

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_shm.h?rev=1.2>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_shm.h.diff?r1=1.1;r2=1.2>

Branch: HEAD

Log:
revision 1.2
date: 2006/05/01 17:15:43;  author: swpadnos;  state: Exp;  lines: +1 -1
Fix typos in the word "Oscilloscope"

--- scope_shm.h	2004/03/08 04:37:14	1.1
+++ scope_shm.h	2006/05/01 17:15:43	1.2
@@ -1,7 +1,7 @@
 #ifndef HALSC_SHM_H
 #define HALSC_SHM_H
 /** This file, 'halsc_shm.h', contains declarations used by both
-    'halscope.c' and 'halscope_rt.c' to implement an oscilliscope.
+    'halscope.c' and 'halscope_rt.c' to implement an oscilloscope.
     The declarations in this file are used by both the realtime
     and user space components of the scope.  Those used only in
     realtime are in 'halsc_rt.h', and those used only in user

Modified file emc2/src/hal/utils/scope_usr.h

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_usr.h?rev=1.9>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_usr.h.diff?r1=1.8;r2=1.9>

Branch: HEAD

Log:
revision 1.9
date: 2006/05/01 17:15:43;  author: swpadnos;  state: Exp;  lines: +1 -1
Fix typos in the word "Oscilloscope"

--- scope_usr.h	2006/03/20 04:59:50	1.8
+++ scope_usr.h	2006/05/01 17:15:43	1.9
@@ -2,7 +2,7 @@
 #define HALSC_USR_H
 /** This file, 'scope_usr.h', contains declarations used by
     'halscope.c' and other source files to implement the user
-    space portion of the HAL oscilliscope.  Other declarations
+    space portion of the HAL oscilloscope.  Other declarations
     used by both user and realtime code are in 'halsc_shm.h', and
     those used only by realtime code are in 'halsc_rt.h'.
 */