Index: build_tools/prep_moduledeps
===================================================================
--- build_tools/prep_moduledeps	(revision 40423)
+++ build_tools/prep_moduledeps	(working copy)
@@ -2,7 +2,7 @@
 
 get_description() {
 	x=${1}
-	TDESC=`cat $x | grep -e *tdesc | cut -f 2 -d '"'`
+	TDESC=`cat $x | grep -e *tdesc -m 1 | cut -f 2 -d '"'`
 	if [ "$TDESC" = "" ]; then
 		TDESC=`cat $x | grep -A 2 -e *description | grep -e '\"'  | cut -f 2 -d '"'` 
 	fi
Index: apps/app_voicemail.c
===================================================================
--- apps/app_voicemail.c	(revision 40423)
+++ apps/app_voicemail.c	(working copy)
@@ -396,13 +396,16 @@
 static char VM_SPOOL_DIR[PATH_MAX];
 
 static char ext_pass_cmd[128];
+#ifndef ODBC_STORAGE
+#ifndef IMAP_STORAGE
+static char *tdesc = "Comedian Mail (Voicemail System)";
+#endif
+#endif
 #ifdef ODBC_STORAGE
 static char *tdesc = "Comedian Mail (Voicemail System) with ODBC Storage";
 #else
 #ifdef IMAP_STORAGE
 static char *tdesc = "Comedian Mail (Voicemail System) with IMAP Storage";
-#else
-static char *tdesc = "Comedian Mail (Voicemail System)";
 #endif
 #endif
 
Index: apps/app_userevent.c
===================================================================
--- apps/app_userevent.c	(revision 40423)
+++ apps/app_userevent.c	(working copy)
@@ -48,7 +48,7 @@
 static char *descrip = 
 "  UserEvent(eventname[|body]): Sends an arbitrary event to the manager\n"
 "interface, with an optional body representing additional arguments.  The\n"
-"body may be specified as a | delimeted list of headers. Each additional\n"
+"body may be specified as a | delimited list of headers. Each additional\n"
 "argument will be placed on a new line in the event. The format of the\n"
 "event will be:\n"
 "    Event: UserEvent\n"

Index: menuselect/README
===================================================================
--- menuselect/README      (revision 20)
+++ menuselect/README      (working copy)
@@ -8,7 +8,7 @@

 Menuselect is a tool designed to be used in conjunction with GNU make. It
 allows for an XML specification of Makefile variables and optional space
-delimeted values of these variables. These values can then be used in the
+delimited values of these variables. These values can then be used in the
 Makefile to make various decisions during the build process.

 Menuselect also provides a mechanism for dependency checking for each possible
@@ -63,7 +63,7 @@

 CURSES_INCLUDE
 NCURSES_INCLUDE
-If the headers for curses of ncurses (depending on which is used) are in a
+If the headers for curses or ncurses (depending on which is used) are in a
 non-standard location that is not in the default search paths for the
 compiler, extra include locations can be set in this variable. Normally, these
 would just be empty. An example would be:
@@ -127,7 +127,7 @@
    APPS:=$(filter-out $(MENUSELECT_APPS),$(APPS))

    remove_on_change=".lastclean"
-   This attribute can contain a space delimeted list of files to be deleted
+   This attribute can contain a space delimited list of files to be deleted
    when it is time to build an output file if any of the members of this
    category have changed values from their values for existing input when the
    application was started.
@@ -147,7 +147,7 @@
    when the cursor is on it in the menu.

    remove_on_change="apps/app_meetme.o apps/app_meetme.so"
-   This attribute can contain a space delimeted list of files to be deleted
+   This attribute can contain a space delimited list of files to be deleted
    when it is time to build an output file if the value of this member has
    changed from its value in any existing input when the application was
    started.