BSD 4_3_Reno release

[unix-history] / usr / src / bin / rm / rm.1

diff --git a/usr/src/bin/rm/rm.1 b/usr/src/bin/rm/rm.1
index 37d1dcd..8cf8815 100644 (file)
--- a/usr/src/bin/rm/rm.1
+++ b/usr/src/bin/rm/rm.1
@@ -1,66 +1,52 @@
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"

-.\" %sccs.include.redist.man%
+.\" Redistribution and use in source and binary forms are permitted provided
+.\" that: (1) source distributions retain this entire copyright notice and
+.\" comment, and (2) distributions including binaries display the following
+.\" acknowledgement:  ``This product includes software developed by the
+.\" University of California, Berkeley and its contributors'' in the
+.\" documentation or other materials provided with the distribution and in
+.\" all advertising materials mentioning features or use of this software.
+.\" Neither the name of the University nor the names of its contributors may
+.\" be used to endorse or promote products derived from this software without
+.\" specific prior written permission.
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

 .\"
 .\"

-.\"     @(#)rm.1       6.5 (Berkeley) %G%
+.\"     @(#)rm.1       6.4 (Berkeley) 7/24/90

 .\"
 .\"

-.Dd 
+.Dd July 24, 1990

 .Dt RM 1
 .Os BSD 4.4
 .Sh NAME
 .Nm rm
 .Dt RM 1
 .Os BSD 4.4
 .Sh NAME
 .Nm rm

-.Nd remove directory entries
+.Nd Remove directory entries.

 .Sh SYNOPSIS
 .Nm rm
 .Op Fl f Li \&| Fl i
 .Sh SYNOPSIS
 .Nm rm
 .Op Fl f Li \&| Fl i

-.Op Fl dRr
+.Op Fl Rr

 .Ar file ...
 .Sh DESCRIPTION
 .Ar file ...
 .Sh DESCRIPTION

-The
-.Nm rm
-utility attempts to remove the non-directory type files specified on the
-command line.
-If the permissions of the file do not permit writing, and the standard
-input device is a terminal, the user is prompted for confirmation.
+The rm utility removes the directory entry specified by each
+file argument.

 .Pp
 The following options are available:
 .Tw 8n
 .Pp
 The following options are available:
 .Tw 8n

-.Tp Fl d
-Attempt to remove directories as well as other types of files.

 .Tp Fl f
 .Tp Fl f

-Attempt to remove the files without prompting for confirmation,
-regardless of the file's permissions.
-If the file does not exist, do not display a diagnostic message or modify
-the exit status to reflect an error.
-The
-.Fl f
-option overrides any previous
-.Fl i 
-options.
+Force each specified directory entry to be removed
+without prompting for confirmation, regardless of
+the permissions of the file to which it refers.
+Suppress diagnostic messages regarding non-existent
+operands.

 .Tp Fl i
 .Tp Fl i

-Request confirmation before attempting to remove each file, regardless of
-the file's permissions, or whether or not the standard input device is a
-terminal.
-The
-.Fl i
-option overrides any previous
-.Fl f 
-options.
+Write a prompt to the standard error output
+requesting confirmation before removing each existing
+directory entry, regardless of the permissions
+of the file to which it refers.

 .Tp Fl R
 .Tp Fl R

-Attempt to remove the file hierarchy rooted in each file argument.
-The 
-.Fl R
-option implies the
-.Fl d
-option.
-If the
-.Fl i
-option is specified, the user is prompted for confirmation before 
-each directory's contents are processed (as well as before the attempt
-is made to remove the directory).
-If the user does not respond affirmatively, the file hierarchy rooted in
-that directory is skipped.
+Permit directories to be removed (recursively).

 .Pp
 .Tp Fl r
 Equivalent to
 .Pp
 .Tp Fl r
 Equivalent to


@@ -75,26 +61,15 @@ A pathname of a directory entry to be removed.
 .Pp
 The
 .Nm rm
 .Pp
 The
 .Nm rm

-utility removes symbolic links, not the files referenced by the links.
-.Pp
-It is an error to attempt to remove the files ``.'' and ``..''.
-.Pp
-The
-.Nm rm

 utility exits with one of the following values:
 .Tw Ds
 .Tp Li 0
 utility exits with one of the following values:
 .Tw Ds
 .Tp Li 0

-All the named files were removed or the
-.Fl f
-option was specified and some of the directory entries did not exist.
+All the named directory entries were removed.

 .Tp Li >0
 An error occurred.
 .Tp
 .Sh SEE ALSO
 .Tp Li >0
 An error occurred.
 .Tp
 .Sh SEE ALSO

-.Xr rmdir 1 ,
-.Xr stat 2 ,
-.Xr unlink 2 ,
-.Xr fts 3
+.Xr rmdir 1

 .Sh STANDARDS
 The
 .Nm rm
 .Sh STANDARDS
 The
 .Nm rm