There have been three bugs reported in Ubuntu about typos in EVMS. I've put together a single patch with all of them. The patch is against evms 2.5.5. Bug reference: https://launchpad.net/bugs/59012 https://launchpad.net/bugs/73976 https://launchpad.net/bugs/64443 Submitted by: "Daniel Hahler" diff -ru evms-2.5.5.orig/doc/man/evms.8 evms-2.5.5/doc/man/evms.8 --- evms-2.5.5.orig/doc/man/evms.8 2005-06-09 19:26:50.000000000 +0200 +++ evms-2.5.5/doc/man/evms.8 2007-12-19 07:30:35.960563632 +0100 @@ -1146,7 +1146,7 @@ where .TP \fIitem\fR -is the name of a EVMS object, region, container, segment or disk +is the name of an EVMS object, region, container, segment or disk whose options are to be changed. .TP \fIname\fR @@ -1769,7 +1769,7 @@ .B "Query Extended Info" .RS \fBQuery Extended Info\fR command allows access to any additional information -that may be available for a plug-in module, a EVMS object, a region, +that may be available for a plug-in module, an EVMS object, a region, a segment, a disk, or a container. The syntax of this command is: .PP @@ -1781,7 +1781,7 @@ can be abbreviated as \fBei\fR. .TP \fIname\fR -is the name of a EVMS object, disk, region, segment, container, +is the name of an EVMS object, disk, region, segment, container, or plug-in module. It can also be the numeric ID of a plug-in module. .TP @@ -1872,7 +1872,7 @@ is a legitimate value for the option \fIname\fR. .TP \fIobject\fR -is the name of a EVMS object, region, segment or disk +is the name of an EVMS object, region, segment or disk which is to be used to create \fItype\fR. .RE .PP @@ -1896,7 +1896,7 @@ expanded. .TP \fIobject\fR -is the EVMS name of a EVMS object, region, segment or disk +is the EVMS name of an EVMS object, region, segment or disk which is to be used when expanding \fIexpansion-point\fR. .RE .RE @@ -2100,7 +2100,7 @@ where .TP \fIitem\fR -is the name of a EVMS object, region, container, segment or disk +is the name of an EVMS object, region, container, segment or disk whose options are to be changed. .TP \fIname\fR @@ -2211,7 +2211,7 @@ The \fBTask\fR command accesses functions specific to an EVMS plug-in module. The \fBTask\fR command can be used directly on an EVMS plug-in module, or it can be used on a volume, EVMS object, region, segment, or container. -When used on a EVMS object, region segment, or container, the command is +When used on an EVMS object, region segment, or container, the command is directed to the plug-in module that owns the EVMS object, region, segment, or container. When used on a volume, the command is directed to the File System Interface diff -ru evms-2.5.5.orig/engine/engine.c evms-2.5.5/engine/engine.c --- evms-2.5.5.orig/engine/engine.c 2006-02-22 17:05:12.000000000 +0100 +++ evms-2.5.5/engine/engine.c 2007-12-19 07:30:35.960563632 +0100 @@ -1203,7 +1203,7 @@ engine_unregister_name(vol->name); /* - * The volume may also be on the the + * The volume may also be on the * volume_delete_list. If we are processing * the volumes_list, remove the volume from the * volume_delete_list. diff -ru evms-2.5.5.orig/engine/flatten.c evms-2.5.5/engine/flatten.c --- evms-2.5.5.orig/engine/flatten.c 2004-10-14 00:58:10.000000000 +0200 +++ evms-2.5.5/engine/flatten.c 2007-12-19 07:30:35.960563632 +0100 @@ -3245,7 +3245,7 @@ case value_c: *psize += sizeof(value_t); - /* Get the the value type. */ + /* Get the value type. */ value_type = (value_type_t) *((u_int32_t *) net_buf); net_buf += sizeof(u_int32_t); Nur in evms-2.5.5: evms-strings.patch. diff -ru evms-2.5.5.orig/include/plugfuncs.h evms-2.5.5/include/plugfuncs.h --- evms-2.5.5.orig/include/plugfuncs.h 2004-12-09 22:04:23.000000000 +0100 +++ evms-2.5.5/include/plugfuncs.h 2007-12-19 07:30:35.960563632 +0100 @@ -627,7 +627,7 @@ * several different types (strings, ints, etc), they have constraints * on their selection, or they may have dependencies on each other. * - * The Engine will create a EVMS_Task_Message task for the UI. The UI + * The Engine will create an EVMS_Task_Message task for the UI. The UI * will use the task when calling the evms_get_option_descriptor(), * evms_set_option_value(), etc. APIs for getting and setting options. * Your plug-in will be called on its set_option() function with the diff -ru evms-2.5.5.orig/INSTALL evms-2.5.5/INSTALL --- evms-2.5.5.orig/INSTALL 2006-02-24 22:50:14.000000000 +0100 +++ evms-2.5.5/INSTALL 2007-12-19 07:30:35.960563632 +0100 @@ -132,7 +132,7 @@ These instructions are only intended to cover the steps necessary to patch and configure your kernel for use with EVMS. For general instructions on -configuring and compiling a Linux kernel, please see the The Kernel HOWTO +configuring and compiling a Linux kernel, please see The Kernel HOWTO (http://www.tldp.org/HOWTO/Kernel-HOWTO.html). The new Device-Mapper driver with the version-4 ioctl interface is now @@ -889,7 +889,7 @@ packages in a previous section. These instructions will not cover the full details of installing and - setting up Linux-HA. Please read through the the Linux-HA Getting Started + setting up Linux-HA. Please read through the Linux-HA Getting Started and FAQ 'n Tips documents for in-depth instructions on installing the base Linux-HA software. diff -ru evms-2.5.5.orig/plugins/csm/options.c evms-2.5.5/plugins/csm/options.c --- evms-2.5.5.orig/plugins/csm/options.c 2004-09-29 18:28:34.000000000 +0200 +++ evms-2.5.5/plugins/csm/options.c 2007-12-19 07:31:14.458591430 +0100 @@ -1144,7 +1144,7 @@ Info->info[SEG_INFO_SIZE_INDEX].flags |= EVMS_EINFO_FLAGS_NO_UNIT_CONVERSION; Info->info[SEG_INFO_START_INDEX].name = EngFncs->engine_strdup( "Start" ); - Info->info[SEG_INFO_START_INDEX].title = EngFncs->engine_strdup( _("Start Logical Blcok Address") ); + Info->info[SEG_INFO_START_INDEX].title = EngFncs->engine_strdup( _("Start Logical Block Address") ); Info->info[SEG_INFO_START_INDEX].desc = EngFncs->engine_strdup( _("This is the sector offset of the partition on the disk, i.e., the logical block address of the first sector of the partition.") ); Info->info[SEG_INFO_START_INDEX].type = EVMS_Type_Unsigned_Int64; Info->info[SEG_INFO_START_INDEX].unit = EVMS_Unit_None; diff -ru evms-2.5.5.orig/plugins/ogfs/fs_ogfs.c evms-2.5.5/plugins/ogfs/fs_ogfs.c --- evms-2.5.5.orig/plugins/ogfs/fs_ogfs.c 2006-02-22 17:05:18.000000000 +0100 +++ evms-2.5.5/plugins/ogfs/fs_ogfs.c 2007-12-19 07:30:35.960563632 +0100 @@ -554,7 +554,7 @@ * @ogfs_mh: the buffer to place the ogfs metadata within * * This routine opens the given volume device and attempts to read - * certain types of ogfs metadata from the the volume. On success + * certain types of ogfs metadata from the volume. On success * the return buffer will contain either an ogfs superblock or ogfs * journal header. */ @@ -680,7 +680,7 @@ * @ogfs_cg: the buffer to place the ogfs cluster information in * * This routine opens the given volume device and attempts to read - * certain types of ogfs cluster config data from the the volume. + * certain types of ogfs cluster config data from the volume. */ static int ogfs_get_cluster_info(logical_volume_t *volume, cluster_global_t *ogfs_cg) diff -ru evms-2.5.5.orig/plugins/s390/390segmgr.c evms-2.5.5/plugins/s390/390segmgr.c --- evms-2.5.5.orig/plugins/s390/390segmgr.c 2005-06-16 18:53:56.000000000 +0200 +++ evms-2.5.5/plugins/s390/390segmgr.c 2007-12-19 07:30:35.960563632 +0100 @@ -766,7 +766,7 @@ * * On VM, the VTOC is used to make the volume looked completely allocated -BUT- with no * data sets. This is done by using a Format 5 that specifies no freespace and not having - * any Format 1 DSCBs. Guest operating systems usually do not see the real dasd. Rather, + * any Format 1 DSCBs. Guest operating systems usually do not see the real DASD. Rather, * they see the minidisk and can create their own vtoc as needed. A vm disk is setup in * this fashion to protect the minidisks and the guest operating systems that own them. * @@ -822,7 +822,7 @@ /* - * Get dasd info + * Get DASD info */ memset(&devinfo, 0, sizeof(dasd_information_t) ); rc = get_390_dev_info( ld, &devinfo ); @@ -2570,7 +2570,7 @@ func_info->info[index].title = EngFncs->engine_strdup( title ); func_info->info[index].verb = EngFncs->engine_strdup( _("Format") ); func_info->info[index].name = EngFncs->engine_strdup( _("Format") ); - func_info->info[index].help = EngFncs->engine_strdup( _("Use this function to format a dasd device prior to use.") ); + func_info->info[index].help = EngFncs->engine_strdup( _("Use this function to format a DASD device prior to use.") ); ++func_info->count; ++index; diff -ru evms-2.5.5.orig/plugins/s390/options.c evms-2.5.5/plugins/s390/options.c --- evms-2.5.5.orig/plugins/s390/options.c 2004-12-10 21:39:57.000000000 +0100 +++ evms-2.5.5/plugins/s390/options.c 2007-12-19 07:30:35.960563632 +0100 @@ -2230,7 +2230,7 @@ Info->info[1].flags |= EVMS_EINFO_FLAGS_NO_UNIT_CONVERSION; Info->info[2].name = EngFncs->engine_strdup( "Start" ); - Info->info[2].title = EngFncs->engine_strdup( _("Start Logical Block Aaddress") ); + Info->info[2].title = EngFncs->engine_strdup( _("Start Logical Block Address") ); Info->info[2].desc = EngFncs->engine_strdup( _("This is the sector offset of the partition on the disk, i.e., the logical block address of the first sector of the partition.") ); Info->info[2].type = EVMS_Type_Unsigned_Int64; Info->info[2].unit = EVMS_Unit_None; diff -ru evms-2.5.5.orig/plugins/xfs/fs_xfs.c evms-2.5.5/plugins/xfs/fs_xfs.c --- evms-2.5.5.orig/plugins/xfs/fs_xfs.c 2005-06-16 18:54:03.000000000 +0200 +++ evms-2.5.5/plugins/xfs/fs_xfs.c 2007-12-19 07:30:35.960563632 +0100 @@ -227,7 +227,7 @@ tmp->flags |= VOLFLAG_NOT_MOUNTABLE; /* since we discovered the external log before * the fs volume, the size information for the - * log volume is incorrect due the the log size + * log volume is incorrect due to the log size * only being stored if the FS supoerblock so go * update the size infor for the external log * volume. @@ -1248,7 +1248,7 @@ if (xfs_vol->log_vol) { Info->info[4].name = EngFncs->engine_strdup("ExtLog"); Info->info[4].title = EngFncs->engine_strdup(_("External Log Volume")); - Info->info[4].desc = EngFncs->engine_strdup(_("Location of exteral journal")); + Info->info[4].desc = EngFncs->engine_strdup(_("Location of external journal")); Info->info[4].type = EVMS_Type_String; Info->info[4].value.s = EngFncs->engine_strdup(xfs_vol->log_vol->name); } else { diff -ru evms-2.5.5.orig/ui/cli/helpsys.c evms-2.5.5/ui/cli/helpsys.c --- evms-2.5.5.orig/ui/cli/helpsys.c 2005-06-09 19:23:08.000000000 +0200 +++ evms-2.5.5/ui/cli/helpsys.c 2007-12-19 07:30:35.960563632 +0100 @@ -1434,7 +1434,7 @@ Row_Delimiter('*', " Query Extended Info "); My_Printf("This command allows access to any additional information that may be available " - "for a plug-in module, a EVMS object, a disk, a region, a segment, or " + "for a plug-in module, an EVMS object, a disk, a region, a segment, or " "a container. " "The form of this command is:\n\n"); @@ -1445,7 +1445,7 @@ Indent_Printf(1, FALSE, "Extended Info may be abbreviated as EI\n"); Indent_Printf(1, FALSE, - " is the name of a EVMS object, disk, region, segment, " + " is the name of an EVMS object, disk, region, segment, " "container, or plug-in module, or it can be the numeric ID of a plug-in module.\n"); Indent_Printf(1, FALSE, " is the name of a specific piece of extended information. " @@ -1518,7 +1518,7 @@ Indent_Printf(1, FALSE, " is a legitimate value for the option .\n"); Indent_Printf(1, FALSE, - " is the EVMS name of a EVMS object, region, segment or disk " + " is the EVMS name of an EVMS object, region, segment or disk " "which is to be used to create .\n\n"); My_Printf("For determining what is acceptable for use with an Expand command, " @@ -1535,7 +1535,7 @@ Indent_Printf(1, FALSE, " is the name of a Volume or Storage Object that is to be expanded.\n"); Indent_Printf(1, FALSE, - " is the EVMS name of a EVMS object, region, segment or disk " + " is the EVMS name of an EVMS object, region, segment or disk " "which is to be used when expanding .\n\n"); return; @@ -2151,7 +2151,7 @@ "The Task command is used to access features specific to an EVMS Plug-in module. " "The Task command may be used directly on an EVMS Plug-in module, " "or it may be used on a volume, EVMS object, region, segment, or container. " - "When used on a EVMS object, region, segment, or container, the command will be " + "When used on an EVMS object, region, segment, or container, the command will be " "directed to the plug-in module which owns the EVMS object, region, segment, or container. " "When used on a volume, the command is directed to the File System Interface Module " "associated with the volume.\n\n" @@ -2306,7 +2306,7 @@ Indent_Printf(1, FALSE, "Mkfs - creates a filesystem on a volume.\n"); Indent_Printf(1, FALSE, - "Modify - Some of the options associated with a EVMS object, " + "Modify - Some of the options associated with an EVMS object, " "region, container, disk or segment may be modified. " "This command or the Set command may be used to modify such options.\n"); Indent_Printf(1, FALSE, @@ -2329,7 +2329,7 @@ Indent_Printf(1, FALSE, "Save - causes any changes which have not yet been written to disk to be written to disk.\n"); Indent_Printf(1, FALSE, - "Set - Some of the options associated with a EVMS object, " + "Set - Some of the options associated with an EVMS object, " "region, container, disk or segment may be modified. " "This command or the Modify command may be used to modify such options.\n"); Indent_Printf(1, FALSE, diff -ru evms-2.5.5.orig/ui/cli/scanner.c evms-2.5.5/ui/cli/scanner.c --- evms-2.5.5.orig/ui/cli/scanner.c 2003-09-25 16:54:27.000000000 +0200 +++ evms-2.5.5/ui/cli/scanner.c 2007-12-19 07:30:35.960563632 +0100 @@ -251,7 +251,7 @@ Local Function Prototypes --------------------------------------------------*/ -/* The following function creates a token using the the characters in the Buffer. */ +/* The following function creates a token using the characters in the Buffer. */ static TokenType * MakeToken( TokenCharacterizations Characterization); /* The following function gets a character using the current context. If the diff -ru evms-2.5.5.orig/ui/gtk/backup.c evms-2.5.5/ui/gtk/backup.c --- evms-2.5.5.orig/ui/gtk/backup.c 2004-12-16 18:48:41.000000000 +0100 +++ evms-2.5.5/ui/gtk/backup.c 2007-12-19 07:31:56.956416029 +0100 @@ -322,7 +322,7 @@ NULL, TRUE, get_main_window_id()); } else { display_results_window(rc, _("Backup Metadata"), - _("An error occured while backing up the metadata.\n"), + _("An error occurred while backing up the metadata.\n"), NULL, TRUE, get_main_window_id()); } } diff -ru evms-2.5.5.orig/ui/gtk/help.c evms-2.5.5/ui/gtk/help.c --- evms-2.5.5.orig/ui/gtk/help.c 2004-07-27 18:15:07.000000000 +0200 +++ evms-2.5.5/ui/gtk/help.c 2007-12-19 07:30:35.960563632 +0100 @@ -56,7 +56,7 @@ return _("This dialog window allows you to create a compatibility volume.\n" "A compatibility volume does not add EVMS meta-data to the object to\n" "use for the volume. Unlike native EVMS volumes, there is no\n" - "opportunity to given the volume a persistent name. The name the\n" + "opportunity to give the volume a persistent name. The name the\n" "volume will use is generated from the storage object's name.\n\n" "To create the compatibility volume, select one\n" "of the topmost storage objects in the selection list and\n" @@ -470,7 +470,7 @@ return _("This dialog window allows you to remove a file system and\n" "its associated File System Interface Module (FSIM) from a volume.\n\n" "This operation is typically initiated if you intend to apply\n" - "a new file system or start over with a empty file system using\n" + "a new file system or start over with an empty file system using\n" "the same FSIM. Another reason to remove a file system may be to\n" "have the FSIM remove any of its meta-data that might allow it\n" "to be recognized or mountable by a file system driver.\n\n" diff -ru evms-2.5.5.orig/ui/gtk/interfaces/main_window.glade evms-2.5.5/ui/gtk/interfaces/main_window.glade --- evms-2.5.5.orig/ui/gtk/interfaces/main_window.glade 2004-07-27 18:15:08.000000000 +0200 +++ evms-2.5.5/ui/gtk/interfaces/main_window.glade 2007-12-19 07:30:35.960563632 +0100 @@ -502,7 +502,7 @@ enter_notify_event update_statusbar_message - _("Add a EVMS feature to an EVMS volume") + _("Add an EVMS feature to an EVMS volume") Wed, 17 Apr 2002 22:24:58 GMT @@ -764,7 +764,7 @@ enter_notify_event update_statusbar_message - _("Convert a compatibility volume to a EVMS volume") + _("Convert a compatibility volume to an EVMS volume") Tue, 16 Apr 2002 18:08:17 GMT diff -ru evms-2.5.5.orig/ui/gtk/main_window.c evms-2.5.5/ui/gtk/main_window.c --- evms-2.5.5.orig/ui/gtk/main_window.c 2004-12-16 18:48:41.000000000 +0100 +++ evms-2.5.5/ui/gtk/main_window.c 2007-12-19 07:30:35.960563632 +0100 @@ -2716,7 +2716,7 @@ GTK_SIGNAL_FUNC(on_shrink_container_menu_item_activate), NULL); gtk_signal_connect(GTK_OBJECT(add_feature_to_volume_menu_item), "enter_notify_event", GTK_SIGNAL_FUNC(update_statusbar_message), - _("Add a EVMS feature to an EVMS volume")); + _("Add an EVMS feature to an EVMS volume")); gtk_signal_connect(GTK_OBJECT(add_feature_to_volume_menu_item), "leave_notify_event", GTK_SIGNAL_FUNC(update_statusbar_message), NULL); gtk_signal_connect(GTK_OBJECT(add_feature_to_volume_menu_item), "activate", @@ -2782,7 +2782,7 @@ gtk_signal_connect(GTK_OBJECT(convert_to_evms_volume_menu_item), "enter_notify_event", GTK_SIGNAL_FUNC(update_statusbar_message), - _("Convert a compatibility volume to a EVMS volume")); + _("Convert a compatibility volume to an EVMS volume")); gtk_signal_connect(GTK_OBJECT(convert_to_evms_volume_menu_item), "leave_notify_event", GTK_SIGNAL_FUNC(update_statusbar_message), NULL); gtk_signal_connect(GTK_OBJECT(convert_to_evms_volume_menu_item), "activate", Nur in evms-2.5.5/ui/gtk: main_window.c.orig. diff -ru evms-2.5.5.orig/ui/gtk/move.c evms-2.5.5/ui/gtk/move.c --- evms-2.5.5.orig/ui/gtk/move.c 2003-11-12 21:44:01.000000000 +0100 +++ evms-2.5.5/ui/gtk/move.c 2007-12-19 07:30:35.960563632 +0100 @@ -262,12 +262,12 @@ case DISK: error_msg = _("An error was encountered attempting to replace the logical disk."); - success_msg = _("The the logical disk is scheduled to be replaced."); + success_msg = _("The logical disk is scheduled to be replaced."); break; default: error_msg = _("The replace operation encountered an error."); - success_msg = _("The the storage object is scheduled to be replaced."); + success_msg = _("The storage object is scheduled to be replaced."); break; } diff -ru evms-2.5.5.orig/ui/gtk/resize.c evms-2.5.5/ui/gtk/resize.c --- evms-2.5.5.orig/ui/gtk/resize.c 2004-08-14 00:14:37.000000000 +0200 +++ evms-2.5.5/ui/gtk/resize.c 2007-12-19 07:30:35.960563632 +0100 @@ -448,7 +448,7 @@ * * Description: * This routine responds to volume/objects selection for an EVMS_Task_Expand - * or EVMS_Task_Shrink action by getting the the expand/shrink points + * or EVMS_Task_Shrink action by getting the expand/shrink points * for the volume/object. Once the expand/shrink point is selected and * the user continues, a task context will be started for normal * task selectable objects and options processing. diff -ru evms-2.5.5.orig/ui/gtk/support.c evms-2.5.5/ui/gtk/support.c --- evms-2.5.5.orig/ui/gtk/support.c 2003-11-12 21:44:01.000000000 +0100 +++ evms-2.5.5/ui/gtk/support.c 2007-12-19 07:30:35.960563632 +0100 @@ -1216,7 +1216,7 @@ * event - the event->in boolean will tell us whether we are getting * or losing keyboard focus * user_data - if getting focus, this should be a pointer to a string with - * the the status message + * the status message * * Exit: * Always returns FALSE Nur in evms-2.5.5/ui/gtk: support.c.orig. diff -ru evms-2.5.5.orig/ui/gtk/value.c evms-2.5.5/ui/gtk/value.c --- evms-2.5.5.orig/ui/gtk/value.c 2004-09-23 00:37:14.000000000 +0200 +++ evms-2.5.5/ui/gtk/value.c 2007-12-19 07:30:35.960563632 +0100 @@ -1209,7 +1209,7 @@ * Description: * This routine takes a float that expresses a size unit * (KB,MB,TB,etc.) and converts it to a value_t of value_type_t - * expressed in a EVMS_Unit_Sectors unit of measurement. + * expressed in an EVMS_Unit_Sectors unit of measurement. * * Entry: * size - the sector unit size as a real number @@ -1357,7 +1357,7 @@ * value - the union of the basic data types * type - the id of the data type * unit - the value unit measurement - * format - the format for the the display value + * format - the format for the display value * * Exit: * Returns the value converted to a string followed by the @@ -1402,7 +1402,7 @@ * value - the union of the basic data types * type - the id of the data type * unit - the value unit measurement - * format - the format for the the display value + * format - the format for the display value * ok_to_convert - TRUE if we are allowed to convert * the value to something more readable * diff -ru evms-2.5.5.orig/ui/gtk/volume_cb.c evms-2.5.5/ui/gtk/volume_cb.c --- evms-2.5.5.orig/ui/gtk/volume_cb.c 2005-04-05 22:09:33.000000000 +0200 +++ evms-2.5.5/ui/gtk/volume_cb.c 2007-12-19 07:30:35.960563632 +0100 @@ -174,7 +174,7 @@ * Before we show the window, setup the signal handlers * that will populate the clist when the clist is realized. * Also initialize the "Cancel" button to dismiss the window. - * Setup the the "Next" button to invoke the task and display + * Setup the "Next" button to invoke the task and display * a results window. The "Next" button's sensitivity is reliant * on a row selection. The "Previous" button should be set * to insensitive since now panel preceded it. @@ -641,7 +641,7 @@ * void on_modify_volume_selection_button_clicked (GtkButton *, gpointer) * * Description: - * This routine initiates the the modification of a volume's properties. + * This routine initiates the modification of a volume's properties. * It creates another window that allows modifying the properties of * of the currently selected volume. * @@ -1380,7 +1380,7 @@ * * Exit: * Selection list populated with a list of feature plugins that - * can be added to a EVMS volume. + * can be added to an EVMS volume. * */ void populate_clist_with_addible_features_for_volume(GtkCList * clist, gpointer user_data) @@ -1446,7 +1446,7 @@ * * Description: * This routine will display the EVMS features that can add - * themselves between the the volume and the previous topmost + * themselves between the volume and the previous topmost * object. * * Entry: diff -ru evms-2.5.5.orig/ui/gtk/widget.c evms-2.5.5/ui/gtk/widget.c --- evms-2.5.5.orig/ui/gtk/widget.c 2004-03-15 22:22:54.000000000 +0100 +++ evms-2.5.5/ui/gtk/widget.c 2007-12-19 07:30:35.960563632 +0100 @@ -173,7 +173,7 @@ * value - the value in its natural form * * Exit: - * Returns the string as an option value in the the correct unit of measurement + * Returns the string as an option value in the correct unit of measurement * */ inline void convert_string_to_option_value(gchar * text, option_widget_info_t * info, @@ -754,7 +754,7 @@ * This routine gets called when text is deleted in an option * entry box. This callback routine does not call * evms_set_option_value() like the other callbacks. Instead, - * it checks to see if the option is for a EVMS_Type_String + * it checks to see if the option is for an EVMS_Type_String * and do executes the options callout if the remaining text * falls below the plug-in's minimum length. * diff -ru evms-2.5.5.orig/ui/ncurses/menu.c evms-2.5.5/ui/ncurses/menu.c --- evms-2.5.5.orig/ui/ncurses/menu.c 2004-12-16 21:52:18.000000000 +0100 +++ evms-2.5.5/ui/ncurses/menu.c 2007-12-19 07:30:35.960563632 +0100 @@ -1499,7 +1499,7 @@ inline void append_add_menu_items(void) { append_menu_item(add_menu, _("Feature to Volume..."), - _("Add a EVMS Feature to an EVMS Volume"), + _("Add an EVMS Feature to an EVMS Volume"), get_accelerator_char(_("_Feature to Volume...")), FALSE, (menuitem_activate_cb)actions_add_feature_menuitem_activated, NULL); @@ -1720,14 +1720,14 @@ inline void append_convert_menu_items(void) { append_menu_item(convert_menu, _("Compatibility Volume to EVMS Volume..."), - _("Convert a Compatibility Volume to a EVMS Volume"), + _("Convert a Compatibility Volume to an EVMS Volume"), get_accelerator_char(_("_Compatibility Volume to EVMS Volume...")), FALSE, (menuitem_activate_cb)actions_convert_vol_menuitem_activated, NULL); append_menu_item(convert_menu, _("EVMS Volume to Compatibility Volume..."), - _("Convert a EVMS Volume to a Compatibility Volume"), + _("Convert an EVMS Volume to a Compatibility Volume"), get_accelerator_char(_("_EVMS Volume to Compatibility Volume...")), FALSE, (menuitem_activate_cb)actions_convert_evms_vol_menuitem_activated, diff -ru evms-2.5.5.orig/ui/ncurses/options.c evms-2.5.5/ui/ncurses/options.c --- evms-2.5.5.orig/ui/ncurses/options.c 2004-09-24 00:45:06.000000000 +0200 +++ evms-2.5.5/ui/ncurses/options.c 2007-12-19 07:30:35.960563632 +0100 @@ -884,7 +884,7 @@ * as well as updating the value text for the clist item. * * Care should be take not to reference the old option descriptor pointer after this - * call as the the structure will have been freed. + * call as the structure will have been freed. */ void replace_option(task_handle_t task, struct clist_item *item, option_descriptor_t *option, GSList *options) { diff -ru evms-2.5.5.orig/ui/ncurses/replace.c evms-2.5.5/ui/ncurses/replace.c --- evms-2.5.5.orig/ui/ncurses/replace.c 2003-12-01 19:10:34.000000000 +0100 +++ evms-2.5.5/ui/ncurses/replace.c 2007-12-19 07:30:35.960563632 +0100 @@ -241,7 +241,7 @@ * context_replace_menuitem_activated - replace object initiated from context menu * @item: the menu item that caused this function to get invoked * - * This routine is called to replace the the object selected with one of + * This routine is called to replace the object selected with one of * the targets we'll present the user. */ int context_replace_menuitem_activated(struct menu_item *item) diff -ru evms-2.5.5.orig/ui/ncurses/task.c evms-2.5.5/ui/ncurses/task.c --- evms-2.5.5.orig/ui/ncurses/task.c 2006-02-22 17:05:18.000000000 +0100 +++ evms-2.5.5/ui/ncurses/task.c 2007-12-19 07:30:35.960563632 +0100 @@ -438,7 +438,7 @@ } /** - * populate_resulting_objects_clist - populate the the resulting objects' window clist + * populate_resulting_objects_clist - populate the resulting objects' window clist * @clist: the resulting objects window clist * @resulting_objects: the address of an array containing handles for objects produced by task * @@ -730,7 +730,7 @@ * * This routine is called to produce the row/column text for a thing placed * in the declination window clist containing the name of a declined object and - * the the declination reason. + * the declination reason. */ int format_declination_item(declined_handle_t *declined, GPtrArray *text) { @@ -766,7 +766,7 @@ } /** - * populate_declination_clist - populate the the declination window clist with names and reasons + * populate_declination_clist - populate the declination window clist with names and reasons * @clist: the declination window clist * @declined_objects: the address of an array containing handles and declination reason codes * diff -ru evms-2.5.5.orig/ui/ncurses/value.c evms-2.5.5/ui/ncurses/value.c --- evms-2.5.5.orig/ui/ncurses/value.c 2004-09-23 00:37:15.000000000 +0200 +++ evms-2.5.5/ui/ncurses/value.c 2007-12-19 07:30:35.960563632 +0100 @@ -919,7 +919,7 @@ * * This routine takes a float that expresses a size unit * (KB,MB,TB,etc.) and converts it to a value_t of value_type_t - * expressed in a EVMS_Unit_Sectors unit of measurement. + * expressed in an EVMS_Unit_Sectors unit of measurement. */ void convert_float_to_sector_value(gfloat size, value_type_t type, value_unit_t unit, value_t *value) { @@ -1026,7 +1026,7 @@ * @value: the union of the basic data types * @type: the id of the data type * @unit: the value unit measurement - * @format: the format for the the display value + * @format: the format for the display value * * This routine takes a value and converts it to a string with * the short form of the unit value concatenated to the string. @@ -1058,7 +1058,7 @@ * @value: the union of the basic data types * @type: the id of the data type * @unit: the value unit measurement - * @format: the format for the the display value + * @format: the format for the display value * @ok_to_convert: TRUE if we are allowed to convert to something readable * * This routine takes a value and converts it to a string with diff -ru evms-2.5.5.orig/ui/ncurses/volume.c evms-2.5.5/ui/ncurses/volume.c --- evms-2.5.5.orig/ui/ncurses/volume.c 2003-12-01 19:10:35.000000000 +0100 +++ evms-2.5.5/ui/ncurses/volume.c 2007-12-19 07:30:35.960563632 +0100 @@ -95,7 +95,7 @@ } /** - * filter_evms_volume_create - a clist_filter_func that keeps we can use to create a EVMS volume + * filter_evms_volume_create - a clist_filter_func that keeps we can use to create an EVMS volume * @handle: the thing's handle * @user_data: not used * diff -ru evms-2.5.5.orig/ui/utils/evms_mpathd.c evms-2.5.5/ui/utils/evms_mpathd.c --- evms-2.5.5.orig/ui/utils/evms_mpathd.c 2006-02-22 17:05:19.000000000 +0100 +++ evms-2.5.5/ui/utils/evms_mpathd.c 2007-12-19 07:30:35.960563632 +0100 @@ -659,7 +659,7 @@ /** * get_info * - * The the basic DM info about this multipath device. This will determine + * The basic DM info about this multipath device. This will determine * if the device exists and update the event number. **/ static int get_info(struct multipath *mp)