Standardize package Config.in, change prompt to package name + short description, add URL when missing (and found)

SVN-Revision: 956
2024-12-25 00:11:13 +00:00 · 2005-05-19 16:49:23 +00:00 · 2005-05-19 16:49:23 +00:00 · 4d97e8492b
commit 4d97e8492b
parent d9e323b631
60 changed files with 256 additions and 171 deletions
--- a/openwrt/package/ebtables/Config.in
+++ b/openwrt/package/ebtables/Config.in
@ -1,6 +1,9 @@
 config BR2_PACKAGE_EBTABLES
-	tristate "Ethernet Bridge Firewalling"
+	tristate "ebtables - Ethernet bridge firewall administration utility"
 	default m if CONFIG_DEVEL
 	help
-		Ethernet Bridge Firewalling (ebtables)
-		http://ebtables.sourceforge.net/
+	  Ethernet Bridge Firewalling (ebtables)
+	  
+	  http://ebtables.sourceforge.net/
+	  
+
--- a/openwrt/package/ez-ipupdate/Config.in
+++ b/openwrt/package/ez-ipupdate/Config.in
@ -1,5 +1,9 @@
 config BR2_PACKAGE_EZIPUPDATE
-	tristate "ez-ipupdate"
+	tristate "ez-ipupdate - Client for most dynamic DNS services"
 	default m if CONFIG_DEVEL
 	help
-	  A client for many Dynamic DNS services
+	  A client for many Dynamic DNS services.
+	  
+	  http://ez-ipupdate.com/
+	  
+
--- a/openwrt/package/fping/Config.in
+++ b/openwrt/package/fping/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_FPING
-	tristate "fping"
+	tristate "fping - Program to ping multiple hosts in parallel"
 	default m if CONFIG_DEVEL
 	help
 	  fping is a ping(1) like program which uses the Internet Control Message Protocol
@ -10,3 +10,6 @@ config BR2_PACKAGE_FPING
 	  round-robin fashion. If a host replies, it is noted and removed from the list of 
 	  hosts to check. If a host does not respond within a certain time limit and/or retry
 	  limit it will be considered unreachable.
+	  
+	  http://www.fping.com/
+	  
--- a/openwrt/package/fprobe/Config.in
+++ b/openwrt/package/fprobe/Config.in
@ -1,10 +1,10 @@
 config BR2_PACKAGE_FPROBE
-	tristate "fprobe"
+	tristate "fprobe - NetFlow probe (libpcap-based)"
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBPTHREAD
-
 	help
 	  A NetFlow probe using libpcap
 	  
 	  http://fprobe.sourceforge.net/
+	  
--- a/openwrt/package/fuse/Config.in
+++ b/openwrt/package/fuse/Config.in
@ -1,12 +1,6 @@
-config BR2_PACKAGE_FUSE
-	select BR2_PACKAGE_LIBPTHREAD
-	depends BR2_PACKAGE_KMOD_FUSE
-	bool
-	default n
-
 config BR2_PACKAGE_KMOD_FUSE
 	select BR2_PACKAGE_FUSE
-	tristate "kmod-fuse (FUSE kernel module)"
+	tristate "kmod-fuse - FUSE kernel module"
 	default m if CONFIG_DEVEL
 	help
 	  With FUSE it is possible to implement a fully functional 
@ -28,9 +22,10 @@ config BR2_PACKAGE_KMOD_FUSE
 	  Depends: libpthread

 config BR2_PACKAGE_LIBFUSE
-	depends BR2_PACKAGE_KMOD_FUSE
-	tristate "libfuse (FUSE library)"
+	tristate "libfuse - FUSE library"
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_KMOD_FUSE
+	select BR2_PACKAGE_LIBPTHREAD
 	help
 	  With FUSE it is possible to implement a fully functional 
 	  filesystem in a userspace program.
@ -51,9 +46,10 @@ config BR2_PACKAGE_LIBFUSE
 	  Depends: libpthread

 config BR2_PACKAGE_FUSE_UTILS
-	depends BR2_PACKAGE_LIBFUSE
-	tristate "fuse-utils (FUSE utilities)"
+	tristate "fuse-utils - FUSE utilities"
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIBFUSE
+	select BR2_PACKAGE_LIBPTHREAD
 	help
 	  With FUSE it is possible to implement a fully functional 
 	  filesystem in a userspace program.
@ -73,3 +69,8 @@ config BR2_PACKAGE_FUSE_UTILS
 	  
 	  Depends: libpthread

+
+config BR2_PACKAGE_FUSE
+	tristate
+	default BR2_PACKAGE_KMOD_FUSE
+
--- a/openwrt/package/glib/Config.in
+++ b/openwrt/package/glib/Config.in
@ -1,6 +1,6 @@
 config BR2_PACKAGE_GLIB1
 	select BR2_PACKAGE_LIBPTHREAD
-	tristate "glib 1.2"
+	tristate "glib 1.2 - The GLib library of C routines"
 	default m if CONFIG_DEVEL
 	help
 	  GLib is a library containing many useful C routines for things such
--- a/openwrt/package/gmp/Config.in
+++ b/openwrt/package/gmp/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_LIBGMP
-	tristate "libgmp"
+	tristate "libgmp - GNU multiprecision arithmetic library"
 	default m if CONFIG_DEVEL
 	help
 	  GNU multiprecision arithmetic library
@ -7,3 +7,6 @@ config BR2_PACKAGE_LIBGMP
 	  http://www.swox.com/gmp/
 	  

+config BR2_PACKAGE_GMP
+	tristate
+	default BR2_PACKAGE_LIBGMP
--- a/openwrt/package/haserl/Config.in
+++ b/openwrt/package/haserl/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_HASERL
-	tristate "haserl"
+	tristate "haserl - CGI wrapper to embed shell scripts in HTML documents"
 	default m if CONFIG_DEVEL
 	help
 	  A CGI wrapper to embed shell scripts in HTML documents.
--- a/openwrt/package/howl/Config.in
+++ b/openwrt/package/howl/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_HOWL
-	bool "howl - a cross-platform implementation of Zeroconf networking"
+	bool "howl - Zeroconf networking implementation"
 	default y if CONFIG_DEVEL
 	help
 	  A cross-platform implementation of Zeroconf networking.
@ -8,27 +8,27 @@ config BR2_PACKAGE_HOWL
 	  

 config BR2_PACKAGE_LIBHOWL
+	depends BR2_PACKAGE_HOWL
 	tristate "libhowl - howl library"
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_HOWL

 config BR2_PACKAGE_HOWL_UTILS
+	depends BR2_PACKAGE_LIBHOWL
 	tristate "howl-utils - howl client utilities"
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_LIBHOWL

 config BR2_PACKAGE_MDNSRESPONDER
+	depends BR2_PACKAGE_LIBHOWL
 	tristate "mdnsresponder - an mDNS (Multicast DNS) service responder daemon"
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_LIBHOWL

 config BR2_PACKAGE_AUTOIPD
+	depends BR2_PACKAGE_LIBHOWL
 	tristate "autoipd - an IPv4 Link-Local address self-assigner daemon"
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_LIBHOWL

 config BR2_PACKAGE_NIFD
+	depends BR2_PACKAGE_LIBHOWL
 	tristate "nifd - a network interface monitor daemon"
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_LIBHOWL

--- a/openwrt/package/htpdate/Config.in
+++ b/openwrt/package/htpdate/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_HTPDATE
-	tristate "htpdate - an HTP (Hypertext Time Protocol) implementation"
+	tristate "htpdate - HTP (Hypertext Time Protocol) implementation"
 	default m if CONFIG_DEVEL
 	help
 	  An HTP (Hypertext Time Protocol) implementation
--- a/openwrt/package/iptables/Config.in
+++ b/openwrt/package/iptables/Config.in
@ -1,27 +1,28 @@
 config BR2_PACKAGE_IPTABLES
-	tristate "iptables"
+	tristate "iptables - IPv4 firewall administration tool"
 	default y
 	help
 	  Linux kernel (2.4+) firewall, NAT, and packet mangling tools.
-
+	  
 	  http://www.iptables.org/
+	  

 config BR2_PACKAGE_IPTABLES_UTILS
-	tristate "save and restore"
+	tristate "iptables - Save and restore utilities"
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_IPTABLES
 	help
 	  iptables-save and iptables-restore

 config BR2_PACKAGE_IPTABLES_EXTRA
-	tristate "extra modules"
+	tristate "extra modules - Extra modules not found elsewhere"
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_IPTABLES
 	help
 	  Extra modules for iptables (kernel and user space)

 config BR2_PACKAGE_IP6TABLES
-	tristate "ip6tables"
+	tristate "ip6tables - IPv6 firewall administration tool"
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_IPTABLES
 	select BR2_PACKAGE_KMOD_IPV6
--- a/openwrt/package/libelf/Config.in
+++ b/openwrt/package/libelf/Config.in
@ -1,8 +1,9 @@
 config BR2_PACKAGE_LIBELF
-	tristate "libelf"
+	tristate "libelf - ELF object file access library"
 	default m if CONFIG_DEVEL
 	help
 	  This is the public release of libelf-0.8.5, a free ELF object
 	  file access library.
-
+	  
 	  http://www.stud.uni-hannover.de/~michael/software/
+	  
--- a/openwrt/package/libgd/Config.in
+++ b/openwrt/package/libgd/Config.in
@ -1,6 +1,10 @@
 config BR2_PACKAGE_LIBGD
-	tristate "libgd"
+	tristate "libgd - The GD Graphics Library"
 	default m if CONFIG_DEVEL
 	help
-	 The GD Graphics Library 
+	 The GD Graphics Library
+	 
+	 http://www.boutell.com/gd/
+	 
+
 	  
--- a/openwrt/package/libnet/Config.in
+++ b/openwrt/package/libnet/Config.in
@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBNET
-	select BR2_PACKAGE_LIBPCAP
-	tristate "libnet"
+	tristate "libnet - Low-level packet creation library"
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBPCAP
 	help
 	  A low-level packet creation library.
 	  
--- a/openwrt/package/libosip2/Config.in
+++ b/openwrt/package/libosip2/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_LIBOSIP2
-	tristate "libosip2 (GNU oSIP library)"
+	tristate "libosip2 - GNU oSIP library"
 	default m if CONFIG_DEVEL
 	help
 	  GNU oSIP library, a Session Initiation Protocol (SIP) implementation
--- a/openwrt/package/libpcap/Config.in
+++ b/openwrt/package/libpcap/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_LIBPCAP
-	tristate "libpcap (a low-level packet capture library)"
+	tristate "libpcap - Low-level packet capture library"
 	default m if CONFIG_DEVEL
 	help
 	  A system-independent library for user-level network packet capture.
--- a/openwrt/package/libpng/Config.in
+++ b/openwrt/package/libpng/Config.in
@ -1,6 +1,10 @@
 config BR2_PACKAGE_LIBPNG
-	tristate "libpng"
+	tristate "libpng - PNG (Portable Network Graphics) format files handling library"
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_ZLIB
 	help
 	  A library for reading/writing PNG files
+	  
+	  http://www.libpng.org/pub/png/libpng.html
+	  
+
--- a/openwrt/package/libpthread/Config.in
+++ b/openwrt/package/libpthread/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_LIBPTHREAD
-	tristate "libpthread (POSIX threads library)"
+	tristate "libpthread - POSIX threads library"
 	default m if CONFIG_DEVEL
 	help
 	  POSIX threads library
--- a/openwrt/package/libusb/Config.in
+++ b/openwrt/package/libusb/Config.in
@ -1,5 +1,9 @@
 config BR2_PACKAGE_LIBUSB
-	tristate "libusb"
+	tristate "libusb - Library for accessing Linux USB devices"
 	default m if CONFIG_DEVEL
 	help
 	  A library for accessing Linux USB devices
+	  
+	  http://libusb.sourceforge.net/
+	  
+
--- a/openwrt/package/lighttpd/Config.in
+++ b/openwrt/package/lighttpd/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_LIGHTTPD
-	prompt "lighttpd - a flexible and lightweight web server"
+	prompt "lighttpd - Flexible and lightweight web server"
 	tristate 
 	default m if CONFIG_DEVEL
 	help
@ -12,61 +12,61 @@ config BR2_PACKAGE_LIGHTTPD

 config BR2_PACKAGE_LIGHTTPD_MOD_ALIAS
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-alias - a directory alias module"
+	prompt "mod-alias - Directory alias module"
 	tristate 
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_LIGHTTPD_MOD_AUTH
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-auth - an authentication module"
+	prompt "mod-auth - Authentication module"
 	tristate 
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_LIGHTTPD_MOD_CGI
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-cgi - a CGI module"
+	prompt "mod-cgi - CGI module"
 	tristate 
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_LIGHTTPD_MOD_PROXY
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-proxy - a proxy module"
+	prompt "mod-proxy - Proxy module"
 	tristate 
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_LIGHTTPD_MOD_REDIRECT
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-redirect - an url redirection module"
+	prompt "mod-redirect - URL redirection module"
 	tristate 
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_LIGHTTPD_MOD_REWRITE
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-rewrite - an url rewriting module"
+	prompt "mod-rewrite - URL rewriting module"
 	tristate 
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_LIGHTTPD_MOD_SETENV
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-setenv - an environment variable setting module"
+	prompt "mod-setenv - Environment variable setting module"
 	tristate 
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_LIGHTTPD_MOD_SIMPLE_VHOST
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-simple-vhost - a simple virtual hosting module"
+	prompt "mod-simple-vhost - Simple virtual hosting module"
 	tristate 
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_LIGHTTPD_MOD_STATUS
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-status - a server status display module"
+	prompt "mod-status - Server status display module"
 	tristate 
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_LIGHTTPD_MOD_USERTRACK
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-usertrack - an user tracking module"
+	prompt "mod-usertrack - User tracking module"
 	tristate 
 	default m if CONFIG_DEVEL

--- a/openwrt/package/lzo/Config.in
+++ b/openwrt/package/lzo/Config.in
@ -1,7 +1,12 @@
 config BR2_PACKAGE_LIBLZO
-	tristate "liblzo (a real-time data compression library)"
+	tristate "liblzo - Real-time data compression library"
 	default m if CONFIG_DEVEL
 	help
 	  A real-time data compression library
-	 
+	  
 	  http://www.oberhumer.com/opensource/lzo/
+	  
+
+config BR2_PACKAGE_LZO
+	tristate
+	default BR2_PACKAGE_LIBLZO
--- a/openwrt/package/maradns/Config.in
+++ b/openwrt/package/maradns/Config.in
@ -1,5 +1,9 @@
 config BR2_PACKAGE_MARADNS
-	tristate "MaraDNS"
+	tristate "maradns - Small and secure DNS Server"
 	default m if CONFIG_DEVEL
 	help
-	  A small secure DNS server
+	  A small and secure DNS server
+	  
+	  http://www.maradns.org/
+	  
+
--- a/openwrt/package/matrixssl/Config.in
+++ b/openwrt/package/matrixssl/Config.in
@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBMATRIXSSL
 	select BR2_PACKAGE_LIBPTHREAD
-	tristate "libmatrixssl - an embedded SSL implementation"
+	tristate "libmatrixssl - Embedded SSL implementation"
 	default m if CONFIG_DEVEL
 	help
 	  An embedded SSL implementation
--- a/openwrt/package/microperl/Config.in
+++ b/openwrt/package/microperl/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_MICROPERL
-	tristate "microperl"
+	tristate "microperl - A really minimal perl"
 	default m if CONFIG_DEVEL
 	help
 	  Perl without operating-specific functions such as readdir.
--- a/openwrt/package/monit/Config.in
+++ b/openwrt/package/monit/Config.in
@ -1,8 +1,10 @@
 config BR2_PACKAGE_MONIT
-	tristate "monit"
+	tristate "monit - System services monitoring utility"
 	select BR2_PACKAGE_LIBPTHREAD
 	default m if CONFIG_DEVEL
 	help
 	  utility for monitoring services on a Unix system
 	  
 	  http://www.tildeslash.com/monit/
+	  
+	
--- a/openwrt/package/ncurses/Config.in
+++ b/openwrt/package/ncurses/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_LIBNCURSES
-	tristate "libncurses - a terminal handling library"
+	tristate "libncurses - Terminal handling library"
 	default m if CONFIG_DEVEL
 	help
 	  A terminal handling library
--- a/openwrt/package/nmap/Config.in
+++ b/openwrt/package/nmap/Config.in
@ -1,8 +1,11 @@
 config BR2_PACKAGE_NMAP
-	tristate "Nmap"
-	select BR2_PACKAGE_LIBPCRE
-	select BR2_PACKAGE_LIBPCAP
-	select BR2_PACKAGE_UCLIBCXX
+	tristate "nmap - Network exploration and/or security auditing utility"
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_LIBPCRE
+	select BR2_PACKAGE_UCLIBCXX
 	help
 	  A free open source utility for network exploration or security auditing. 
+	  
+	  http://www.insecure.org/nmap/
+	  
--- a/openwrt/package/nocatsplash/Config.in
+++ b/openwrt/package/nocatsplash/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_NOCATSPLASH
-	tristate "NoCatSplash"
+	tristate "nocatsplash - Open public network gateway daemon"
 	default m if CONFIG_DEVEL
 	help
 	 NoCatSplash is an Open Public Network Gateway Daemon.
--- a/openwrt/package/ntpclient/Config.in
+++ b/openwrt/package/ntpclient/Config.in
@ -1,5 +1,9 @@
 config BR2_PACKAGE_NTPCLIENT
-	tristate "ntpclient"
+	tristate "ntpclient - NTP (Network Time Protocol) client"
 	default m if CONFIG_DEVEL
 	help
 	  NTP client for setting system time from NTP servers.
+	  
+	  http://doolittle.faludi.com/ntpclient/
+	  
+
--- a/openwrt/package/olsrd/Config.in
+++ b/openwrt/package/olsrd/Config.in
@ -9,37 +9,37 @@ config BR2_PACKAGE_OLSRD

 config BR2_PACKAGE_OLSRD_MOD_DOT_DRAW
 	depends BR2_PACKAGE_OLSRD
-	prompt "mod-dot-draw - a dot topology information plugin"
+	prompt "mod-dot-draw - Dot topology information plugin"
 	tristate
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_OLSRD_MOD_DYN_GW
 	depends BR2_PACKAGE_OLSRD
-	prompt "mod-dyn-gw - a dynamic internet gateway plugin"
+	prompt "mod-dyn-gw - Dynamic internet gateway plugin"
 	tristate
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_OLSRD_MOD_HTTPINFO
 	depends BR2_PACKAGE_OLSRD
-	prompt "mod-httpinfo - a small informative web server plugin"
+	prompt "mod-httpinfo - Small informative web server plugin"
 	tristate
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_OLSRD_MOD_NAMESERVICE
 	depends BR2_PACKAGE_OLSRD
-	prompt "mod-nameservice - a lightweight hostname resolver plugin"
+	prompt "mod-nameservice - Lightweight hostname resolver plugin"
 	tristate
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_OLSRD_MOD_POWER
 	depends BR2_PACKAGE_OLSRD
-	prompt "mod-power - a power status plugin"
+	prompt "mod-power - Power status plugin"
 	tristate
 	default m if CONFIG_DEVEL

 config BR2_PACKAGE_OLSRD_MOD_SECURE
 	depends BR2_PACKAGE_OLSRD
-	prompt "mod-secure - a message signing plugin to secure olsrd routing domain"
+	prompt "mod-secure - Message signing plugin to secure olsrd routing domain"
 	tristate
 	default m if CONFIG_DEVEL

--- a/openwrt/package/openldap/Config.in
+++ b/openwrt/package/openldap/Config.in
@ -1,6 +1,7 @@
 config BR2_PACKAGE_OPENLDAP
-	tristate "OpenLDAP"
-	default m if CONFIG_DEVEL
+	prompt "openldap - Open source LDAP (Lightweight Directory Access Protocol) implementation"
+	bool
+	default y if CONFIG_DEVEL
 	help
 	  OpenLDAP Software is an open source implementation of the 
 	  Lightweight Directory Access Protocol (LDAP).
@ -9,12 +10,12 @@ config BR2_PACKAGE_OPENLDAP
 	  

 config BR2_PACKAGE_LIBOPENLDAP
-	tristate "libopenldap (client libraries)"
+	tristate "libopenldap - client libraries"
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_OPENLDAP

 config BR2_PACKAGE_OPENLDAP_UTILS
-	tristate "openldap-utils (client utilities)"
+	tristate "openldap-utils - client utilities"
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_OPENLDAP

--- a/openwrt/package/openntpd/Config.in
+++ b/openwrt/package/openntpd/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_OPENNTPD
-	tristate "openntpd - a FREE, easy to use implementation of NTP (Network Time Protocol)"
+	tristate "openntpd - FREE and easy to use NTP (Network Time Protocol) implementation"
 	default m if CONFIG_DEVEL
 	help
 	  NTP server
--- a/openwrt/package/openvpn/Config.in
+++ b/openwrt/package/openvpn/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_OPENVPN
-	tristate "OpenVPN"
+	tristate "openvpn - Open source VPN solution using SSL"
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_TUN
 	select BR2_PACKAGE_OPENSSL
--- a/openwrt/package/osiris/Config.in
+++ b/openwrt/package/osiris/Config.in
@ -1,11 +1,15 @@
 config BR2_PACKAGE_OSIRISD
-	tristate "osirisd - an Host Integrity Monitoring System (scanning agent)"
+	tristate "osirisd - Host integrity monitoring system (scanning agent)"
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_OPENSSL
 	help
-	  An Host Integrity Monitoring System (scanning agent)
+	  An host integrity monitoring system (scanning agent)
 	  
 	  http://www.hostintegrity.com/osiris/
 	  
 	  Depends: openssl
 	  
+
+config BR_PACKAGE_OSIRIS
+	tristate
+	default BR2_PACKAGE_OSIRISD
--- a/openwrt/package/pcre/Config.in
+++ b/openwrt/package/pcre/Config.in
@ -1,5 +1,5 @@
-config BR2_PACKAGE_PCRE
-	tristate "pcre"
+config BR2_PACKAGE_LIBPCRE
+	tristate "libpcre - a Perl Compatible Regular Expression library"
 	default m if CONFIG_DEVEL
 	help
 	  A Perl Compatible Regular Expression library
@ -7,7 +7,7 @@ config BR2_PACKAGE_PCRE
 	  http://www.pcre.org/
 	  

-config BR2_PACKAGE_LIBPCRE
+config BR2_PACKAGE_PCRE
 	tristate
-	default BR2_PACKAGE_PCRE
+	default BR2_PACKAGE_LIBPCRE

--- a/openwrt/package/pmacct/Config.in
+++ b/openwrt/package/pmacct/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_PMACCT
-	prompt "pmacct - a set of IPv4/IPv6 accounting and aggregation tools"
+	prompt "pmacct - IPv4/IPv6 accounting and aggregation tools"
 	bool
 	default y if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPCAP
@ -12,7 +12,7 @@ config BR2_PACKAGE_PMACCT

 choice
 	depends BR2_PACKAGE_PMACCT
-	prompt "nfacctd - a NetFlow accounting daemon"
+	prompt "nfacctd - NetFlow accounting daemon"
 	tristate
 	default m if CONFIG_DEVEL
 	default n
@ -67,7 +67,7 @@ endchoice

 choice
 	depends BR2_PACKAGE_PMACCT
-	prompt "pmacctd - an IP accounting daemon"
+	prompt "pmacctd - IP accounting daemon (libpcap based)"
 	tristate
 	default m if CONFIG_DEVEL
 	default n
@ -122,7 +122,7 @@ endchoice

 config BR2_PACKAGE_PMACCT_CLIENT
 	depends BR2_PACKAGE_PMACCT
-	prompt "pmacct-client: a command-line client to gather data from the IMT plugin" if BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_NFACCTD_MYSQL || BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_NFACCTD_CUSTOM || BR2_PACKAGE_PMACCTD_BASIC || BR2_PACKAGE_PMACCTD_MYSQL || BR2_PACKAGE_PMACCTD_PGSQL || BR2_PACKAGE_PMACCTD_CUSTOM
+	prompt "pmacct-client - Command-line client to gather data from the IMT plugin" if BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_NFACCTD_MYSQL || BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_NFACCTD_CUSTOM || BR2_PACKAGE_PMACCTD_BASIC || BR2_PACKAGE_PMACCTD_MYSQL || BR2_PACKAGE_PMACCTD_PGSQL || BR2_PACKAGE_PMACCTD_CUSTOM
 	tristate
 	default n

--- a/openwrt/package/popt/Config.in
+++ b/openwrt/package/popt/Config.in
@ -1,5 +1,5 @@
-config BR2_PACKAGE_POPT
-	tristate "popt (a command line option parsing library)"
+config BR2_PACKAGE_LIBPOPT
+	tristate "libpopt - Command line option parsing library"
 	default m if CONFIG_DEVEL
 	help
 	  A command line option parsing library
@ -7,7 +7,7 @@ config BR2_PACKAGE_POPT
 	  ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
 	  

-config BR2_PACKAGE_LIBPOPT
+config BR2_PACKAGE_POPT
 	tristate
-	default BR2_PACKAGE_POPT
+	default BR2_PACKAGE_LIBPOPT

--- a/openwrt/package/portmap/Config.in
+++ b/openwrt/package/portmap/Config.in
@ -1,5 +1,7 @@
 config BR2_PACKAGE_PORTMAP
-	tristate "RPC Portmapper"
+	tristate "portmap - RPC Portmapper"
 	default m if CONFIG_DEVEL
 	help
 	  The RPC Portmapper (used by the NFS Server)
+	  
+	
--- a/openwrt/package/ppp/Config.in
+++ b/openwrt/package/ppp/Config.in
@ -18,19 +18,19 @@ config BR2_PACKAGE_PPP_MOD_RADIUS
 	depends on BR2_PACKAGE_PPP

 config BR2_PACKAGE_CHAT
-	prompt "chat - an utility to establish conversation with other PPP servers (via a modem)"
+	prompt "chat - Utility to establish conversation with other PPP servers (via a modem)"
 	tristate
 	default m
 	depends on BR2_PACKAGE_PPP

 config BR2_PACKAGE_PPPDUMP
-	prompt "pppdump - an utility to read PPP record file"
+	prompt "pppdump - Utility to read PPP record file"
 	tristate
 	default m
 	depends on BR2_PACKAGE_PPP

 config BR2_PACKAGE_PPPSTATS
-	prompt "pppstats - an utility to report PPP statistics"
+	prompt "pppstats - Utility to report PPP statistics"
 	tristate
 	default m
 	depends on BR2_PACKAGE_PPP
--- a/openwrt/package/pptp/Config.in
+++ b/openwrt/package/pptp/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_PPTP
-	prompt "pptp - a PPTP (Point-to-Point Tunneling Protocol) client"
+	prompt "pptp - PPTP (Point-to-Point Tunneling Protocol) client"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_GRE
--- a/openwrt/package/pptpd/Config.in
+++ b/openwrt/package/pptpd/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_PPTPD
-	prompt "pptpd - a PPTP (Point-to-Point Tunneling Protocol) server"
+	prompt "pptpd - PPTP (Point-to-Point Tunneling Protocol) server"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_GRE
--- a/openwrt/package/quagga/Config.in
+++ b/openwrt/package/quagga/Config.in
@ -1,37 +1,54 @@
 config BR2_PACKAGE_QUAGGA
-	tristate "Quagga"
+	tristate "quagga - the Quagga Software Routing Suite"
 	default m if CONFIG_DEVEL
 	help
-	routing software package that provides TCP/IP based routing services
-        with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2, 
-        OSPFv3, BGP-4, and BGP-4+
-
-	http://www.quagga.net/
-
-config BR2_PACKAGE_QUAGGA_ZEBRA
-	tristate "zebra daemon"
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_QUAGGA
-	help
-	 zebra daemon
-
-config BR2_PACKAGE_QUAGGA_RIPD
-	tristate "ripd daemon"
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_QUAGGA
-	help
-	 ripd daemon
+	  A routing software package that provides TCP/IP based routing services
+	  with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2, 
+	  OSPFv3, BGP-4, and BGP-4+
+	  
+	  http://www.quagga.net/
+	  

 config BR2_PACKAGE_QUAGGA_BGPD
-	tristate "bgpd daemon"
+	tristate "bgpd - BGPv4, BGPv4\+, BGPv4\- routing engine"
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_QUAGGA
 	help
-	 bgpd daemon
+	  A BGPv4, BGPv4\+, BGPv4\- routing engine for use with Quagga routing
+	  software.

 config BR2_PACKAGE_QUAGGA_OSPFD
-	tristate "ospfd daemon"
+	tristate "ospfd - OSPFv2 routing engine"
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_QUAGGA
 	help
-	 ospfd daemon
+	  An OSPFv2 routing engine for use with Quagga routing software.
+
+config BR2_PACKAGE_QUAGGA_OSPF6D
+	tristate "ospf6d - OSPFv3 routing engine"
+	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_QUAGGA
+	help
+	  An OSPFv3 routing engine for use with Quagga routing software.
+
+config BR2_PACKAGE_QUAGGA_RIPD
+	tristate "ripd - RIP routing engine"
+	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_QUAGGA
+	help
+	  A RIP routing engine for use with Quagga routing software.
+
+config BR2_PACKAGE_QUAGGA_RIPD
+	tristate "ripngd - RIPNG routing engine"
+	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_QUAGGA
+	help
+	  A RIPNG routing engine for use with Quagga routing software.
+
+config BR2_PACKAGE_QUAGGA_ZEBRA
+	tristate "zebra - Routing manager"
+	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_QUAGGA
+	help
+	  A routing manager for use with associated Quagga components.
+
--- a/openwrt/package/radvd/Config.in
+++ b/openwrt/package/radvd/Config.in
@ -1,6 +1,9 @@
 config BR2_PACKAGE_RADVD
-	select BR2_PACKAGE_KMOD_IPV6
-	tristate "radvd"
+	tristate "radvd - IPv6 Routing Advertisement Daemon"
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_KMOD_IPV6
 	help
 	  Routing Advertisement Daemon for IPv6
+	  
+	  http://v6web.litech.org/radvd/
+	  
--- a/openwrt/package/robocfg/Config.in
+++ b/openwrt/package/robocfg/Config.in
@ -1,5 +1,6 @@
 config BR2_PACKAGE_ROBOCFG
-	tristate "robocfg"
+	tristate "robocfg - BCM5325E/536x switch configuration utility"
 	default m if CONFIG_DEVEL
 	help
 	  Broadcom BCM5325E/536x switch configuration utility
+	  
--- a/openwrt/package/screen/Config.in
+++ b/openwrt/package/screen/Config.in
@ -1,6 +1,9 @@
 config BR2_PACKAGE_SCREEN
-	tristate "screen"
+	tristate "screen - Full-screen terminal window manager"
 	default m if CONFIG_DEVEL
 	help
 	  Screen is a full-screen window manager that multiplexes a physical 
 	  terminal between several processes, typically interactive shells.
+	  
+	  http://www.gnu.org/software/screen/
+	  
--- a/openwrt/package/setserial/Config.in
+++ b/openwrt/package/setserial/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_SETSERIAL
-	tristate "setserial"
+	tristate "setserial - Serial port configuration utility"
 	default m if CONFIG_DEVEL
 	help
 	  setserial  is a program designed to set and/or report the
@ -7,4 +7,5 @@ config BR2_PACKAGE_SETSERIAL
 	  information  includes what I/O port and IRQ a particular
 	  serial port is using, and whether or not the break key should
 	  be interpreted as the Secure  Attention  Key, and so on.
+	  

--- a/openwrt/package/shat/Config.in
+++ b/openwrt/package/shat/Config.in
@ -1,6 +1,7 @@
 config BR2_PACKAGE_SHAT
-	tristate "shat (Source Hardware Address Translation)"
+	tristate "shat - Source Hardware Address Translation"
 	default m if CONFIG_DEVEL
 	help
-		A tool which allows hosts with arbitrary IP configuration
-		to connect to the internet over a SHAT gateway.
+	  A tool which allows hosts with arbitrary IP configuration
+	  to connect to the internet over a SHAT gateway.
+	  
--- a/openwrt/package/shfs/Config.in
+++ b/openwrt/package/shfs/Config.in
@ -1,16 +1,8 @@
-config BR2_PACKAGE_SHFS
-	tristate
-	default n
-	depends BR2_PACKAGE_KMOD_SHFS
-	help
-
-
 config BR2_PACKAGE_KMOD_SHFS
-	tristate "kmod-shfs (ShFS kernel module)"
+	tristate "kmod-shfs - Shell FileSystem kernel module (ShFS) kernel module"
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_SHFS
 	help
-	
+	  
 	  Shell FileSystem kernel module
 	  
 	  ShFS is a simple and easy to use Linux kernel module which 
@ -31,12 +23,20 @@ config BR2_PACKAGE_KMOD_SHFS
 	  
 	  
 	  http://shfs.sourceforge.net/
-		  
+	  

 config BR2_PACKAGE_SHFS_UTILS
 	depends BR2_PACKAGE_KMOD_SHFS
-	tristate "shfs-utils (ShFS mount/umount utilities)"
+	tristate "shfs-utils - ShFS mount/umount utilities"
 	default m if CONFIG_DEVEL
 	help
-	
+	  
 	  Shell FileSystem mount/umount utilities
+	  
+
+config BR2_PACKAGE_SHFS
+	tristate
+	default n
+	depends BR2_PACKAGE_KMOD_SHFS
+	help
+
--- a/openwrt/package/siproxd/Config.in
+++ b/openwrt/package/siproxd/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_SIPROXD
-	tristate "siproxd - a SIP (Session Initiation Protocol) proxy"
+	tristate "siproxd - SIP (Session Initiation Protocol) proxy"
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBOSIP2
 	help
--- a/openwrt/package/sipsak/Config.in
+++ b/openwrt/package/sipsak/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_SIPSAK
-	tristate "sipsak - a SIP (Session Initiation Protocol) stress and diagnostics utility"
+	tristate "sipsak - SIP (Session Initiation Protocol) stress and diagnostics utility"
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_OPENSSL
 	help
--- a/openwrt/package/snort/Config.in
+++ b/openwrt/package/snort/Config.in
@ -1,5 +1,5 @@
 choice
-	prompt "snort"
+	prompt "snort - Ligthweight Network Intrusion Detection System (NIDS)"
 	tristate
 	default n
 	optional
--- a/openwrt/package/strace/Config.in
+++ b/openwrt/package/strace/Config.in
@ -1,9 +1,10 @@
 config BR2_PACKAGE_STRACE
-	tristate "strace"
+	tristate "strace - System call tracer"
 	default m if CONFIG_DEVEL
 	help
 	  A useful diagnostic, instructional, and debugging tool.
 	  Allows you to track what system calls a program makes 
 	  while it is running.
-
+	  
 	  http://sourceforge.net/projects/strace/
+	  
--- a/openwrt/package/tcpdump/Config.in
+++ b/openwrt/package/tcpdump/Config.in
@ -1,9 +1,9 @@
 config BR2_PACKAGE_TCPDUMP
-	select BR2_PACKAGE_LIBPCAP
-	tristate "tcpdump"
+	tristate "tcpdump - Network monitoring and data acquisition tool"
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBPCAP
 	help
 	  A tool for network monitoring and data acquisition.
-
+	  
 	  http://www.tcpdump.org/
-
+	  
--- a/openwrt/package/tinc/Config.in
+++ b/openwrt/package/tinc/Config.in
@ -1,11 +1,10 @@
 config BR2_PACKAGE_TINC
-	tristate "tinc"
+	tristate "tinc - VPN tunneling daemon"
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_KMOD_TUN
 	select BR2_PACKAGE_LIBLZO
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_KMOD_TUN
-
+	select BR2_PACKAGE_ZLIB
 	help
 	  A VPN tunneling daemon
 	  
--- a/openwrt/package/usbutils/Config.in
+++ b/openwrt/package/usbutils/Config.in
@ -1,12 +1,14 @@
-config BR2_PACKAGE_USBUTILS
-	tristate "lsusb"
+config BR2_PACKAGE_LSUSB
+	tristate "lsusb - USB devices listing program"
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBUSB
 	help
 	  A program to list Linux USB devices
+	  
+	  http://linux-usb.sourceforge.net/
+	  

-
-config BR2_PACKAGE_LSUSB
+config BR2_PACKAGE_USBUTILS
 	tristate
-	default BR2_PACKAGE_USBUTILS
+	default BR2_PACKAGE_LSUSB

--- a/openwrt/package/vsftpd/Config.in
+++ b/openwrt/package/vsftpd/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_VSFTPD
-	tristate "vsftpd - a fast and secure FTP server"
+	tristate "vsftpd - Fast and secure FTP server"
 	default m if CONFIG_DEVEL
 	help
 	  A fast and secure FTP server
--- a/openwrt/package/wireless-tools/Config.in
+++ b/openwrt/package/wireless-tools/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_WIRELESS_TOOLS
-	tristate "wireless-tools"
+	tristate "wireless-tools - Tools for manipulating Linux Wireless Extensions"
 	default y
 	help
 	  Tools for configuring Wireless Adapters implementing the "Wireless Extension"
--- a/openwrt/package/wol/Config.in
+++ b/openwrt/package/wol/Config.in
@ -1,5 +1,9 @@
 config BR2_PACKAGE_WOL
-	tristate "Wake On LAN client"
+	tristate "wol - Wake On LAN client"
 	default m if CONFIG_DEVEL
 	help
-	  wol implements Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant.
+	  wol implements Wake On LAN functionality in a small program. 
+	  It wakes up hardware that is Magic Packet compliant.
+	  
+	  http://ahh.sourceforge.net/wol/
+	  
--- a/openwrt/package/xinetd/Config.in
+++ b/openwrt/package/xinetd/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_XINETD
-	tristate "xinetd - a powerful and secure superserver"
+	tristate "xinetd - Powerful and secure superserver"
 	default m if CONFIG_DEVEL
 	help
 	  A powerful and secure superserver
--- a/openwrt/package/zlib/Config.in
+++ b/openwrt/package/zlib/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_ZLIB
-	tristate "zlib"
+	tristate "zlib - Library implementing the deflate compression method"
 	default m if CONFIG_DEVEL
 	help
 	  A library implementing the 'deflate' compression method