From owner-p4-projects@FreeBSD.ORG Fri May 30 04:23:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2601E106572D; Fri, 30 May 2008 04:23:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1B661065673 for ; Fri, 30 May 2008 04:23:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 943C98FC1B for ; Fri, 30 May 2008 04:23:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4U4NQ0o057166 for ; Fri, 30 May 2008 04:23:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4U4NQgw057164 for perforce@freebsd.org; Fri, 30 May 2008 04:23:26 GMT (envelope-from jb@freebsd.org) Date: Fri, 30 May 2008 04:23:26 GMT Message-Id: <200805300423.m4U4NQgw057164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 142564 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 May 2008 04:23:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=142564 Change 142564 by jb@freebsd3 on 2008/05/30 04:23:22 IF7 Affected files ... .. //depot/projects/dtrace7/src/etc/defaults/bluetooth.device.conf#2 integrate .. //depot/projects/dtrace7/src/share/man/man5/bluetooth.device.conf.5#2 integrate Differences ... ==== //depot/projects/dtrace7/src/etc/defaults/bluetooth.device.conf#2 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/defaults/bluetooth.device.conf,v 1.1 2005/11/10 19:09:22 emax Exp $ +# $FreeBSD: src/etc/defaults/bluetooth.device.conf,v 1.1.6.1 2008/05/30 00:37:41 emax Exp $ # The authentication_enable parameter controls if the device requires to # authenticate the remote device at connection setup. At connection setup, @@ -39,8 +39,7 @@ # The class parameter is used to indicate the capabilities of the device to # other devices. # -# For more details see -# https://www.bluetooth.org/foundry/assignnumb/document/baseband +# For more details see "Assigned Numbers - Bluetooth Baseband" document # # Possible value: # @@ -101,7 +100,7 @@ # The role_switch parameter controls whether the local device should perform # role switch. By default, if role switch is supported, the local device will # try to perform role switch and become Master on incoming connection. Some -# devices do not support role switch and thus incomming connections from such +# devices do not support role switch and thus incoming connections from such # devices will fail. If role switch is disabled then accepting device will # remain Slave. # ==== //depot/projects/dtrace7/src/share/man/man5/bluetooth.device.conf.5#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/bluetooth.device.conf.5,v 1.2 2006/09/30 16:01:33 ru Exp $ +.\" $FreeBSD: src/share/man/man5/bluetooth.device.conf.5,v 1.2.2.1 2008/05/30 00:37:41 emax Exp $ .\" -.Dd December 1, 2005 +.Dd May 27, 2008 .Dt BLUETOOTH.DEVICE.CONF 5 .Os .Sh NAME @@ -56,7 +56,7 @@ The script accepts Bluetooth device driver name as an extra parameter. .Pp The system wide Bluetooth device configuration file is called -.Pa /etc/defaults/bluetooth.device.conf . +.Pa /etc/defaults/\:bluetooth.device.conf . Configuration parameters set in the system wide Bluetooth device configuration file apply to every Bluetooth device connected to the system. .Pp @@ -90,7 +90,8 @@ parameter is used to indicate the capabilities of the device to other devices. For more details see -.Pa https://www.bluetooth.org/foundry/assignnumb/document/baseband . +.Dq Assigned Numbers - Bluetooth Baseband +document. .It Va connectable .Pq Vt bool The