From owner-freebsd-bugs  Thu Apr  3 10:20:07 1997
Return-Path: <owner-bugs>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id KAA06823
          for bugs-outgoing; Thu, 3 Apr 1997 10:20:07 -0800 (PST)
Received: (from gnats@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id KAA06792;
          Thu, 3 Apr 1997 10:20:03 -0800 (PST)
Resent-Date: Thu, 3 Apr 1997 10:20:03 -0800 (PST)
Resent-Message-Id: <199704031820.KAA06792@freefall.freebsd.org>
Resent-From: gnats (GNATS Management)
Resent-To: freebsd-bugs
Resent-Reply-To: FreeBSD-gnats@freefall.FreeBSD.org, roberto@keltia.freenix.fr
Received: from mexico.brainstorm.eu.org (mexico.brainstorm.fr [193.56.58.253])
          by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id KAA06522
          for <FreeBSD-gnats-submit@freebsd.org>; Thu, 3 Apr 1997 10:15:26 -0800 (PST)
Received: from brasil.brainstorm.eu.org (brasil.brainstorm.fr [193.56.58.33])
          by mexico.brainstorm.eu.org (8.8.4/8.8.4) with ESMTP
	  id UAA30423 for <FreeBSD-gnats-submit@freebsd.org>; Thu, 3 Apr 1997 20:15:22 +0200
Received: (from uucp@localhost) by brasil.brainstorm.eu.org (8.8.4/8.6.12) with UUCP id UAA07094 for FreeBSD-gnats-submit@freebsd.org; Thu, 3 Apr 1997 20:15:02 +0200
Received: (from roberto@localhost) by keltia.freenix.fr (8.8.5/keltia-uucp-2.9) id UAA01914;
          Thu, 3 Apr 1997 20:14:13 +0200 (CEST)
Message-Id: <199704031814.UAA01914@keltia.freenix.fr>
Date: Thu, 3 Apr 1997 20:14:13 +0200 (CEST)
From: Ollivier Robert <roberto@keltia.freenix.fr>
Reply-To: roberto@keltia.freenix.fr
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: bin/3187: file.1 still speaks of /etc/magic
Sender: owner-bugs@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk


>Number:         3187
>Category:       bin
>Synopsis:       file.1 still mention /etc/magic
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr  3 10:20:02 PST 1997
>Last-Modified:
>Originator:     Ollivier Robert
>Organization:
Usenet Canal Historique
>Release:        FreeBSD 3.0-CURRENT i386
>Environment:

CURRENT from March, 23th.

FreeBSD keltia.freenix.fr 3.0-CURRENT FreeBSD 3.0-CURRENT #41: Sun Mar 23 23:01:22 CET 1997     roberto@keltia.freenix.fr:/src/src/sys/compile/DKELTIA  i386

file(1) 3.22

>Description:

src/usr.bin/file/file.1 mentions /etc/magic:

...
When modifying the file
.I /etc/magic
or the program itself, 
...
The information in these files is read from the magic file
.I /etc/magic.
.PP
...
.SH FILES
.I /etc/magic
\- default list of magic numbers
.B file
command uses a magic file,
keep the old magic file around for comparison purposes
(rename it to 
.IR /etc/magic.orig ).
...

>How-To-Repeat:

man file

>Fix:
	
Apply the following patch:

Index: file.1
===================================================================
RCS file: /spare/FreeBSD-current/src/usr.bin/file/file.1,v
retrieving revision 1.9
diff -u -2 -r1.9 file.1
--- file.1	1997/03/18 19:37:17	1.9
+++ file.1	1997/04/03 18:12:10
@@ -43,5 +43,5 @@
 that are known to contain binary data.
 When modifying the file
-.I /etc/magic
+.I /usr/share/misc/magic
 or the program itself, 
 .B "preserve these keywords" .
@@ -79,5 +79,5 @@
 offset into the file can usually be described in this way.
 The information in these files is read from the magic file
-.I /etc/magic.
+.I /usr/share/misc/magic.
 .PP
 If an argument appears to be an
@@ -136,6 +136,8 @@
 (on systems that support symbolic links).
 .SH FILES
+.I /usr/share/misc/magic
+\- default list of magic numbers (used to be
 .I /etc/magic
-\- default list of magic numbers
+in previous versions of FreeBSD)
 .SH ENVIRONMENT
 The environment variable


>Audit-Trail:
>Unformatted: