svn commit: r258406 - head/usr.sbin/bsdconfig/includes

[Devin Teske]

Author: dteske
Date: Wed Nov 20 22:11:42 2013
New Revision: 258406
URL: http://svnweb.freebsd.org/changeset/base/258406

Log:
  Make `-d' implicitly enable `-f' for simplification.

Modified:
  head/usr.sbin/bsdconfig/includes/USAGE
  head/usr.sbin/bsdconfig/includes/includes

Modified: head/usr.sbin/bsdconfig/includes/USAGE
==============================================================================
--- head/usr.sbin/bsdconfig/includes/USAGE	Wed Nov 20 21:59:24 2013	(r258405)
+++ head/usr.sbin/bsdconfig/includes/USAGE	Wed Nov 20 22:11:42 2013	(r258406)
@@ -28,7 +28,7 @@ Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS
 
 OPTIONS:
 	-a    Always use color even when output is not to a terminal.
-	-d    Print the description for each function selected.
+	-d    Print description for each function selected. Implies `-f'.
 	-f    Show functions for selected includes.
 	-F pattern
 	      If `-f', only print functions matching pattern. Without `-f'
@@ -68,4 +68,4 @@ EXAMPLES:
 
 	Show descriptions of each of the `show' functions:
 
-		bsdconfig @PROGRAM_NAME@ -dfF show
+		bsdconfig @PROGRAM_NAME@ -dF show

Modified: head/usr.sbin/bsdconfig/includes/includes
==============================================================================
--- head/usr.sbin/bsdconfig/includes/includes	Wed Nov 20 21:59:24 2013	(r258405)
+++ head/usr.sbin/bsdconfig/includes/includes	Wed Nov 20 22:11:42 2013	(r258406)
@@ -127,7 +127,7 @@ show_include()
 while getopts adfF:hn flag; do
 	case "$flag" in
 	a) USE_COLOR=1 ;;
-	d) SHOW_DESC=1 ;;
+	d) SHOW_DESC=1 SHOW_FUNCS=1 ;;
 	f) SHOW_FUNCS=1 ;;
 	F) FUNC_PATTERN="$OPTARG" ;;
 	n) USE_COLOR= ;;