[aadk-commits] qwell: branch uClinux/upstreamsync r298 - in /uClinux/branches/upstreamsync/u...

[aadk-commits at lists.digium.com]

Author: qwell
Date: Mon Apr  2 14:32:31 2007
New Revision: 298

URL: http://svn.digium.com/view/aadk?view=rev&rev=298
Log:
Fix a typo
Add zapscan to the s800i "default" config (which isn't actually used)
Move zapscan applet up so that it actually works.

Modified:
    uClinux/branches/upstreamsync/uClinux-dist/user/busybox/config-s800i
    uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h
    uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/usage.h
    uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Config.in

Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/config-s800i
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/config-s800i?view=diff&rev=298&r1=297&r2=298
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/config-s800i (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/config-s800i Mon Apr  2 14:32:31 2007
@@ -283,6 +283,7 @@
 # CONFIG_WATCHDOG is not set
 CONFIG_MAKEIPLIST=y
 CONFIG_ZTCFG=y
+CONFIG_ZAPSCAN=y
 CONFIG_NVRAM_EDIT=y
 
 #

Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h?view=diff&rev=298&r1=297&r2=298
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h Mon Apr  2 14:32:31 2007
@@ -325,8 +325,8 @@
 USE_WHOAMI(APPLET(whoami, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_XARGS(APPLET(xargs, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_YES(APPLET(yes, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+USE_ZAPSCAN(APPLET(zapscan, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_GUNZIP(APPLET_ODDNAME(zcat, gunzip, _BB_DIR_BIN, _BB_SUID_NEVER, zcat))
-USE_ZAPSCAN(APPLET(zapscan, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_ZCIP(APPLET(zcip, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_ZTCFG(APPLET(ztcfg, _BB_DIR_BIN, _BB_SUID_NEVER))
 

Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/usage.h
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/usage.h?view=diff&rev=298&r1=297&r2=298
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/usage.h (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/usage.h Mon Apr  2 14:32:31 2007
@@ -103,7 +103,7 @@
 
 #define nvram_full_usage \
        "[dump|store] [FILENAME]\n" \
-       "  Dump NVRAM config into a specified file or load\n"
+       "  Dump NVRAM config into a specified file or load\n" \
        "  contents of specified file into NVRAM\n"
 
 #define zapscan_trivial_usage \
@@ -116,7 +116,7 @@
        "[OPTIONS]..."
 
 #define ztcfg_full_usage \
-       "[OPTIONS]...\n"
+       "[OPTIONS]...\n" \
        "   Configure zaptel interfaces.   Valid options are:\n" \
        "  -c <filename>     -- Use <filename> instead of /etc/zaptel.conf\n" \
        "  -d [level]        -- Generate debugging output. (Default level is 1.)\n" \

Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Config.in
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Config.in?view=diff&rev=298&r1=297&r2=298
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Config.in (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Config.in Mon Apr  2 14:32:31 2007
@@ -386,7 +386,7 @@
 	default n
 	help
 	  The zapscan utility automatically scans for FXS and/or FXO 
-	  interfaces and appends ot zaptel.conf and creates 
+	  interfaces and appends to zaptel.conf and creates 
 	  /etc/asterisk/zapscan.conf
 
 config ZTCFG