From owner-svn-src-stable@FreeBSD.ORG  Tue Jan  6 12:39:28 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 751FE1065676;
	Tue,  6 Jan 2009 12:39:28 +0000 (UTC)
	(envelope-from danger@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6201B8FC12;
	Tue,  6 Jan 2009 12:39:28 +0000 (UTC)
	(envelope-from danger@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n06CdS1O031071;
	Tue, 6 Jan 2009 12:39:28 GMT (envelope-from danger@svn.freebsd.org)
Received: (from danger@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n06CdSJC031069;
	Tue, 6 Jan 2009 12:39:28 GMT (envelope-from danger@svn.freebsd.org)
Message-Id: <200901061239.n06CdSJC031069@svn.freebsd.org>
From: Daniel Gerzo <danger@FreeBSD.org>
Date: Tue, 6 Jan 2009 12:39:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186816 - in stable/6/usr.sbin/wpa: . wpa_supplicant
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2009 12:39:29 -0000

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 ,