Bugfixes.

 -Erik

diff --git a/Makefile b/Makefile
index 77a0486e91bc14d8d41026312c3c7c04dda1c3fa..475a6e6fb837ad395fb7c12d827fdf229b36fca3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -101,13 +101,13 @@ all: busybox busybox.links docs
 busybox: $(OBJECTS)
        $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
        $(STRIP)
+       
+docs: docs/busybox.pod
+       $(MAKE) -C docs clean all
 
 busybox.links: busybox.def.h
        - ./busybox.mkll | sort >$@
 
-docs:  docs/busybox.pod
-       $(MAKE) -C docs clean all 
-
 regexp.o nfsmount.o: %.o: %.h
 $(OBJECTS): %.o: busybox.def.h internal.h  %.c
 

diff --git a/coreutils/tr.c b/coreutils/tr.c
index b631b006559aafc0a0cb2b134ff5cfb81795ea44..5f49380287fa3e1821d243205739f3bb31e60c25 100644 (file)
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)tr.c      8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
 
-       "$Id: tr.c,v 1.3 2000/04/15 16:34:54 erik Exp $";
+       "$Id: tr.c,v 1.4 2000/04/17 16:44:46 erik Exp $";
 #endif                                                 /* not lint */
 #endif                                                 /* #if 0 */
 
@@ -138,10 +138,7 @@ int cflag;
 
 static void tr_usage()
 {
-       usage( "\ttr [-csu] string1 string2\n"
-                  "\ttr [-cu] -d string1\n"
-                  "\ttr [-cu] -s string1\n"
-                  "\ttr [-cu] -ds string1 string2\n\n"
+       usage( "\ttr [-cdsu] string1 [string2]\n\n"
                   "Translate, squeeze, and/or delete characters from standard\n"
                   "input, writing to standard output.\n");
 }

diff --git a/docs/busybox.pod b/docs/busybox.pod
index 9926cffd28c58e4fe3ff9de5af366aeaf70f41b4..3a1a6569a85197e23f77f081d304bd6bb8c576c1 100644 (file)
--- a/docs/busybox.pod
+++ b/docs/busybox.pod
@@ -86,11 +86,11 @@ Example:
 Usage: chgrp [OPTION]... GROUP FILE...
 
 Change the group membership of each FILE to GROUP.
- 
+
 Options:
 
        -R      change files and directories recursively
- 
+
 Example:
 
        $ ls -l /tmp/foo
@@ -1532,10 +1532,7 @@ Example:
 
 =item tr
 
-Usage:  tr [-csu] string1 string2
-        tr [-cu] -d string1
-        tr [-cu] -s string1
-        tr [-cu] -ds string1 string2
+Usage:  tr [B<-cdsu>] string1 [string2]
 
 Translate, squeeze, and/or delete characters from standard
 input, writing to standard output.
@@ -1596,7 +1593,7 @@ Example:
 
 Usage: uname [OPTION]...
 
-Print certain system information.  With no OPTION, same as -s.
+Print certain system information.  With no OPTION, same as B<-s>.
 
 Options:
 
@@ -1715,7 +1712,7 @@ Repeatedly outputs a line with all specified STRING(s), or `y'.
 
 =item zcat
 
-This is essentially an alias for invoking "gunzip -c", where 
+This is essentially an alias for invoking "gunzip B<-c>", where 
 it decompresses the file inquestion and send the output to stdout. 
 
 -------------------------------
@@ -1781,4 +1778,4 @@ Enrique Zanardi <ezanardi@ull.es>
 
 =cut
 
-# $Id: busybox.pod,v 1.13 2000/04/17 16:16:10 erik Exp $
+# $Id: busybox.pod,v 1.14 2000/04/17 16:44:46 erik Exp $

diff --git a/tr.c b/tr.c
index b631b006559aafc0a0cb2b134ff5cfb81795ea44..5f49380287fa3e1821d243205739f3bb31e60c25 100644 (file)
--- a/tr.c
+++ b/tr.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)tr.c      8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
 
-       "$Id: tr.c,v 1.3 2000/04/15 16:34:54 erik Exp $";
+       "$Id: tr.c,v 1.4 2000/04/17 16:44:46 erik Exp $";
 #endif                                                 /* not lint */
 #endif                                                 /* #if 0 */
 
@@ -138,10 +138,7 @@ int cflag;
 
 static void tr_usage()
 {
-       usage( "\ttr [-csu] string1 string2\n"
-                  "\ttr [-cu] -d string1\n"
-                  "\ttr [-cu] -s string1\n"
-                  "\ttr [-cu] -ds string1 string2\n\n"
+       usage( "\ttr [-cdsu] string1 [string2]\n\n"
                   "Translate, squeeze, and/or delete characters from standard\n"
                   "input, writing to standard output.\n");
 }