ip link: add VLAN support

[oweals/busybox.git] / networking / Config.src

diff --git a/networking/Config.src b/networking/Config.src
index 8aeba0ef9565840eab9709cf078d97f82199894c..e1ae0c9d54d642ffc3fd17d11eb61e212f5de010 100644 (file)
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -82,12 +82,12 @@ config FEATURE_BRCTL_FANCY
          This adds about 600 bytes.
 
 config FEATURE_BRCTL_SHOW
-       bool "Support show, showmac and showstp"
+       bool "Support show"
        default y
        depends on BRCTL && FEATURE_BRCTL_FANCY
        help
          Add support for option which prints the current config:
-           showmacs, showstp, show
+           show
 
 config DNSD
        bool "dnsd"
@@ -199,14 +199,22 @@ config FEATURE_HTTPD_BASIC_AUTH
        help
          Utilizes password settings from /etc/httpd.conf for basic
          authentication on a per url basis.
+         Example for httpd.conf file:
+         /adm:toor:PaSsWd
 
 config FEATURE_HTTPD_AUTH_MD5
        bool "Support MD5 crypted passwords for http Authentication"
        default y
        depends on FEATURE_HTTPD_BASIC_AUTH
        help
-         Enables basic per URL authentication from /etc/httpd.conf
-         using md5 passwords.
+         Enables encrypted passwords, and wildcard user/passwords
+         in httpd.conf file.
+         User '*' means 'any system user name is ok',
+         password of '*' means 'use system password for this user'
+         Examples:
+         /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
+         /adm:root:*
+         /wiki:*:*
 
 config FEATURE_HTTPD_CGI
        bool "Support Common Gateway Interface (CGI)"
@@ -223,8 +231,8 @@ config FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
        help
          This option enables support for running scripts through an
          interpreter. Turn this on if you want PHP scripts to work
-         properly. You need to supply an additional line in your httpd
-         config file:
+         properly. You need to supply an additional line in your
+         httpd.conf file:
          *.php:/path/to/your/php
 
 config FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
@@ -937,8 +945,8 @@ config WGET
        bool "wget"
        default y
        help
-         wget is a utility for non-interactive download of files from HTTP,
-         HTTPS, and FTP servers.
+         wget is a utility for non-interactive download of files from HTTP
+         and FTP servers.
 
 config FEATURE_WGET_STATUSBAR
        bool "Enable a nifty process meter (+2k)"