From owner-freebsd-doc Sat Apr 27 5:50:17 2002 Delivered-To: freebsd-doc@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 121F537B405 for ; Sat, 27 Apr 2002 05:50:02 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3RCo2S48779; Sat, 27 Apr 2002 05:50:02 -0700 (PDT) (envelope-from gnats) Received: from gothic.blackend.org (blackend.org [212.11.50.35]) by hub.freebsd.org (Postfix) with ESMTP id 39ABE37B416 for ; Sat, 27 Apr 2002 05:40:04 -0700 (PDT) Received: from gothic.blackend.org (localhost [127.0.0.1]) by gothic.blackend.org (8.12.3/8.12.3/ - 15/04/02) with ESMTP id g3RCaSxR043352 for ; Sat, 27 Apr 2002 14:36:28 +0200 (CEST) (envelope-from marc@gothic.blackend.org) Received: (from marc@localhost) by gothic.blackend.org (8.12.3/8.12.3/Submit) id g3RCaS43043351; Sat, 27 Apr 2002 14:36:28 +0200 (CEST) Message-Id: <200204271236.g3RCaS43043351@gothic.blackend.org> Date: Sat, 27 Apr 2002 14:36:28 +0200 (CEST) From: Marc Fonvieille Reply-To: Marc Fonvieille To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: docs/37504: The word PC Card should be used instead of PC-CARD in pccardd.8 and pccard.conf.5 Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 37504 >Category: docs >Synopsis: The word PC Card should be used instead of PC-CARD in pccardd.8 and pccard.conf.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Sat Apr 27 05:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Marc Fonvieille >Release: FreeBSD 4.5-STABLE i386 >Organization: >Environment: System: FreeBSD gothic.blackend.org 4.5-STABLE FreeBSD 4.5-STABLE #0: Fri Apr 19 12:13:41 CEST 2002 marc@gothic.blackend.org:/usr/src/sys/compile/GOTHIC i386 >Description: According to http://www.pcmcia.org/pccardstandard.htm we should use PC Card instead of PC-CARD in manpages >How-To-Repeat: >Fix: --- pccardd.8.diff begins here --- --- pccardd.8.org Sat Apr 27 14:22:08 2002 +++ pccardd.8 Sat Apr 27 14:23:37 2002 @@ -30,7 +30,7 @@ .Os .Sh NAME .Nm pccardd -.Nd PC-CARD (PCMCIA) management daemon +.Nd PC Card (PCMCIA) management daemon .Sh SYNOPSIS .Nm .Op Fl d @@ -42,7 +42,7 @@ .Sh DESCRIPTION .Nm Pccardd is normally started at boot time, and manages the insertion -and removal of PC-CARD cards. +and removal of PC Card cards. .Pp When started, .Nm @@ -51,7 +51,7 @@ which includes .Pa /etc/pccard.conf as the user configuration file) -and scans the available PC-CARD slots for cards. +and scans the available PC Card slots for cards. .Nm Pccardd then waits for .Em "card events" , @@ -79,7 +79,7 @@ will (if required) allocate resources such as an ISA memory block and Input/Output ports from a common pool. .It -The PC-CARD slot is configured with the I/O and memory +The PC Card slot is configured with the I/O and memory contexts allocated, and the kernel driver is attached to this card. .It @@ -101,7 +101,7 @@ are intended to reset any device associated with the removed card. Separate commands may exist for card, driver and device instances. .It -The PC-CARD slot resources are freed. +The PC Card slot resources are freed. .El .Pp Once a card/driver instance is configured, the resources @@ -149,7 +149,7 @@ .Pa /etc/defaults/pccard.conf . The file format is detailed in .Xr pccard.conf 5 , -and lists the PC-CARD cards recognized by +and lists the PC Card cards recognized by .Nm , and the kernel drivers and devices that are used to interface to the card. --- pccardd.8.diff ends here --- --- pccard.conf.5.diff begins here --- --- pccard.conf.5.org Sun Apr 7 06:57:14 2002 +++ pccard.conf.5 Sat Apr 27 14:24:47 2002 @@ -38,10 +38,10 @@ .Nm file is the configuration file for the .Xr pccardd 8 -PC-CARD slot management daemon. +PC Card slot management daemon. It provides information to allow card identification, and the matching of drivers (along -with driver resources) to the PC-CARD cards. +with driver resources) to the PC Card cards. .Pp There are four basic elements within the configuration file; An optional @@ -65,7 +65,7 @@ when the user wishes to override these defaults and/or add additional entries. .Pp -Each PC-CARD card contains configuration tuples that provide +Each PC Card card contains configuration tuples that provide the manufacturer and card version; these are used to identify the card specification in the configuration file, and from this find a driver that can be used to --- pccard.conf.5.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message