From owner-svn-src-stable@FreeBSD.ORG  Fri May 18 02:20:16 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7383B10656A9;
	Fri, 18 May 2012 02:20:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D5038FC1A;
	Fri, 18 May 2012 02:20:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4I2KGIp029854;
	Fri, 18 May 2012 02:20:16 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4I2KGSB029852;
	Fri, 18 May 2012 02:20:16 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201205180220.q4I2KGSB029852@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 18 May 2012 02:20:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235596 - stable/8/usr.sbin/wpa/hostapd
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: Fri, 18 May 2012 02:20:16 -0000

Author: gjb (doc committer)
Date: Fri May 18 02:20:15 2012
New Revision: 235596
URL: http://svn.freebsd.org/changeset/base/235596

Log:
  MFC r235499:
  
  Reword hostapd.conf(5) sentence.

Modified:
  stable/8/usr.sbin/wpa/hostapd/hostapd.conf.5
Directory Properties:
  stable/8/usr.sbin/wpa/   (props changed)

Modified: stable/8/usr.sbin/wpa/hostapd/hostapd.conf.5
==============================================================================
--- stable/8/usr.sbin/wpa/hostapd/hostapd.conf.5	Fri May 18 02:19:53 2012	(r235595)
+++ stable/8/usr.sbin/wpa/hostapd/hostapd.conf.5	Fri May 18 02:20:15 2012	(r235596)
@@ -171,8 +171,8 @@ will be converted to PSK.
 This conversion uses SSID so the PSK changes when ASCII passphrase is
 used and the SSID is changed.
 .It Va wpa_psk_file
-Optionally, WPA PSKs can be read from a separate text file (containing a
-list of PSK,MAC address pairs).
+Optionally, WPA PSKs can be read from a separate text file containing a
+list of PSK and MAC address pairs.
 .It Va wpa_key_mgmt
 Set of accepted key management algorithms (WPA-PSK, WPA-EAP, or both).
 .It Va wpa_pairwise