Move TODOs to file.man.

diff --git a/TODO b/TODO
index 22e621bc75dfff71731823d777bd97184d5868d8..bdfbdc4146db729832ca5f4c03023c153d486a99 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,22 +1,6 @@
-- Fix output so that tests for MIME and APPLE flags are not needed all
-  over the place, and actual output is only done in one place. This
-  needs a design. Suggestion: push possible outputs on to a list, then
-  pick the last-pushed (most specific, one hopes) value at the end, or
-  use a default if the list is empty. This should not slow down evaluation.
+TODOs live in the TODO section of doc/file.man (i.e. file(1)). They
+are more visible there, so please add any further TODOs to that file,
+not here.
 
-- Continue to squash all magic bugs. See Debian BTS for a good source.
-
-- Store arbitrarily long strings, for example for %s patterns, so that
-  they can be printed out. Fixes Debian bug #271672. Would require more
-  complex store/load code in apprentice.
-
-- Add syntax for relative offsets after current level (Debian bug #466037).
-
-- Make file -ki work, i.e. give multiple MIME types.
-
-- Add a zip library so we can peek inside Office2007 documents to
-  figure out what they are.
-
-- Don't complain when ~/.magic is not compiled.
-
-- Add a separate option to print URL's for the sources of the file descriptions.
+(This change was made when Reuben Thomas noticed that all the bugs
+listed in the BUGS section of the man page had been fixed!)

diff --git a/doc/file.man b/doc/file.man
index 20f7d670f4454e6f86e38f05c8385bb773a90859..9772eb1484132934dfd416277ecd2ed44a88e19b 100644 (file)
--- a/doc/file.man
+++ b/doc/file.man
@@ -1,4 +1,4 @@
-.\" $File: file.man,v 1.91 2011/03/12 18:18:39 rrt Exp $
+.\" $File: file.man,v 1.92 2011/03/12 18:53:07 rrt Exp $
 .Dd July 23, 2010
 .Dt FILE __CSECTION__
 .Os
@@ -536,6 +536,30 @@ Please report bugs and send patches to the bug tracker at
 .Pa http://bugs.gw.com/
 or the mailing list at
 .Aq file@mx.gw.com .
+.Sh TODO
+.Pp
+Fix output so that tests for MIME and APPLE flags are not needed all
+over the place, and actual output is only done in one place. This
+needs a design. Suggestion: push possible outputs on to a list, then
+pick the last-pushed (most specific, one hopes) value at the end, or
+use a default if the list is empty. This should not slow down evaluation.
+.Pp
+Continue to squash all magic bugs. See Debian BTS for a good source.
+.Pp
+Store arbitrarily long strings, for example for %s patterns, so that
+they can be printed out. Fixes Debian bug #271672. Would require more
+complex store/load code in apprentice.
+.Pp
+Add syntax for relative offsets after current level (Debian bug #466037).
+.Pp
+Make file -ki work, i.e. give multiple MIME types.
+.Pp
+Add a zip library so we can peek inside Office2007 documents to
+figure out what they are.
+.Pp
+Don't complain when ~/.magic is not compiled.
+.Pp
+Add an option to print URLs for the sources of the file descriptions.
 .Sh AVAILABILITY
 You can obtain the original author's latest version by anonymous FTP
 from