-// Enable command line editing in the shell
-#define BB_FEATURE_SH_COMMAND_EDITING
-//
-//Allow the shell to invoke all the compiled in BusyBox commands as if they
-//were shell builtins. Nice for staticly linking an emergency rescue shell
-//among other thing.
-#define BB_FEATURE_SH_STANDALONE_SHELL
-//
-//When this is enabled, busybox shell builtins can be called using full path
-//names. This causes builtins (which includes every single busybox command
-//when you enable BB_FEATURE_SH_STANDALONE_SHELL) to override real commands on
-//the filesystem. When this is enabled, if you run /bin/cat, it will use
-//BusyBox cat even if /bin/cat exists on the filesystem and is _not_ busybox.
-//Some systems want this, others do not. Choose wisely. :-)
-//BB_FEATURE_SH_BUILTINS_ALWAYS_WIN
-//
-// Enable tab completion in the shell (not yet
-// working very well -- so don't turn this on)
-//#define BB_FEATURE_SH_TAB_COMPLETION
+// Enable command line editing in the shell.
+// Only relevant if BB_SH is enabled. On by default.
+#define BB_FEATURE_COMMAND_EDITING
+//
+// Enable tab completion in the shell. This is now working quite nicely.
+// This feature adds a bit over 4k. Only relevant if BB_SH is enabled.
+#define BB_FEATURE_COMMAND_TAB_COMPLETION
+//
+// Attempts to match usernames in a ~-prefixed path
+//#define BB_FEATURE_COMMAND_USERNAME_COMPLETION
+//
+//Allow the shell to invoke all the compiled in BusyBox applets as if they
+//were shell builtins. Nice for staticly linking an emergency rescue shell,
+//among other things. Off by default.
+// Only relevant if BB_SH is enabled.
+//#define BB_FEATURE_SH_STANDALONE_SHELL
+//
+//When this is enabled, busybox shell applets can be called using full path
+//names. This causes applets (i.e., most busybox commands) to override
+//real commands on the filesystem. For example, if you run run /bin/cat, it
+//will use BusyBox cat even if /bin/cat exists on the filesystem and is _not_
+//busybox. Some systems want this, others do not. Choose wisely. :-) This
+//only has meaning when BB_FEATURE_SH_STANDALONE_SHELL is enabled.
+// Only relevant if BB_SH is enabled. Off by default.
+//#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN
+//
+// Some deeply embedded systems don't have usernames or even hostnames,
+// and the default prompt can look rather hideous on them. Uncomment
+// this option for a simpler, path-only prompt (which was the default until
+// around BusyBox-0.48). On by default.
+// Only relevant if BB_SH is enabled.
+#define BB_FEATURE_SH_SIMPLE_PROMPT