svn commit: r186816 - in stable/6/usr.sbin/wpa: . wpa_supplicant

[Daniel Gerzo]

Author: danger (doc committer)
Date: Tue Jan  6 12:39:28 2009
New Revision: 186816
URL: http://svn.freebsd.org/changeset/base/186816

Log:
  MFC r180158:
  
  - install the example wpa_supplicant.conf file to the share/examples/etc
    directory [1]
  - add the FILES section to the wpa_supplicant.conf.5 file, so that people
    will be able to detect the example configuration file easier. [2]
  
  PR:		docs/121821 [2]
  Submitted by:	edwin [2]
  Approved by:	brooks [1]

Modified:
  stable/6/usr.sbin/wpa/   (props changed)
  stable/6/usr.sbin/wpa/wpa_supplicant/Makefile
  stable/6/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5

Modified: stable/6/usr.sbin/wpa/wpa_supplicant/Makefile
==============================================================================
--- stable/6/usr.sbin/wpa/wpa_supplicant/Makefile	Tue Jan  6 12:23:19 2009	(r186815)
+++ stable/6/usr.sbin/wpa/wpa_supplicant/Makefile	Tue Jan  6 12:39:28 2009	(r186816)
@@ -11,6 +11,11 @@ SRCS=	config.c eloop.c common.c md5.c rc
 
 MAN=	wpa_supplicant.8 wpa_supplicant.conf.5
 
+.if ${MK_EXAMPLES} != "no"
+FILESDIR= ${SHAREDIR}/examples/etc
+FILES=	wpa_supplicant.conf
+.endif
+
 CFLAGS+= -I${.CURDIR} -I${WPA_SUPPLICANT_DISTDIR}
 CFLAGS+= -DCONFIG_DRIVER_BSD
 CFLAGS+= -DCONFIG_DRIVER_NDIS

Modified: stable/6/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
==============================================================================
--- stable/6/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5	Tue Jan  6 12:23:19 2009	(r186815)
+++ stable/6/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5	Tue Jan  6 12:39:28 2009	(r186816)
@@ -514,6 +514,11 @@ network={
         wep_key0=42FEEDDEAFBABEDEAFBEEFAA55
 }
 .Ed
+.Sh FILES
+.Bl -tag -width ".Pa /usr/share/examples/etc/wpa_supplicant.conf" -compact
+.It Pa /etc/wpa_supplicant.conf
+.It Pa /usr/share/examples/etc/wpa_supplicant.conf
+.El
 .Sh SEE ALSO
 .Xr wpa_cli 8 ,
 .Xr wpa_passphrase 8 ,