From: Antoine Leca <Antoine.Leca.1@gmail.com>
Date: Thu, 19 Jan 2012 10:12:55 +0000 (+0000)
Subject: Don't overwrite old mv, ln, cp, etc man pages with new rm
X-Git-Tag: v3.2.0~109
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=57794c6690d124faa154d0929f6a07e066f934b2;p=minix.git

Don't overwrite old mv, ln, cp, etc man pages with new rm
---

diff --git a/docs/UPDATING b/docs/UPDATING
index 8b4da10c5..272ae0fe8 100644
--- a/docs/UPDATING
+++ b/docs/UPDATING
@@ -1,3 +1,12 @@
+20120119:
+	Follow up to previous entry. The same problem also exists for
+	the man pages.
+
+	Do this BEFORE a 'make world':
+	# rm /usr/man/man1/rm.1
+	# cp /usr/man/man1/cp.1 /usr/man/man1/rm.1
+	Then 'make clean world' as usual.
+
 20120112:
 	Replace our native rm and rmdir with NetBSD version.
 
diff --git a/man/man1/Makefile b/man/man1/Makefile
index 5ee7f2d22..8cc48047f 100644
--- a/man/man1/Makefile
+++ b/man/man1/Makefile
@@ -15,7 +15,7 @@ MAN=	acd.1 anm.1 ar.1 ash.1 asize.1 at.1 banner.1 basename.1 \
 	mkproto.1 modem.1 mount.1 mt.1 nice.1 nm.1 nohup.1 od.1 \
 	paste.1 ping.1 playwave.1 postmort.1 pr.1 prep.1 \
 	profile.1 ps.1 pwd.1 rcp.1 readall.1 recwave.1 \
-	ref.1 remsync.1 rget.1 rlogin.1 rmdir.1 rsh.1 rz.1 \
+	ref.1 remsync.1 rget.1 rlogin.1 rsh.1 rz.1 \
 	shar.1 acksize.1 sleep.1 sort.1   spell.1 \
 	split.1 strip.1 stty.1 su.1 sum.1 svc.1 \
 	synctree.1 sysenv.1 sz.1 tail.1 tee.1 telnet.1 template.1 \
@@ -54,7 +54,6 @@ MLINKS += ash.1 unset.1
 MLINKS += ash.1 wait.1
 MLINKS += compress.1 uncompress.1
 MLINKS += cp.1 mv.1
-MLINKS += cp.1 rm.1
 MLINKS += cp.1 ln.1
 MLINKS += cp.1 cpdir.1
 MLINKS += elvis.1 ex.1
diff --git a/man/man1/rmdir.1 b/man/man1/rmdir.1
deleted file mode 100644
index acf68eb49..000000000
--- a/man/man1/rmdir.1
+++ /dev/null
@@ -1,27 +0,0 @@
-.TH RMDIR 1
-.SH NAME
-rmdir \- remove a directory
-.SH SYNOPSIS
-\fBrmdir \fIdirectory ...\fR
-.br
-.de FL
-.TP
-\\fB\\$1\\fR
-\\$2
-..
-.de EX
-.TP 20
-\\fB\\$1\\fR
-# \\$2
-..
-.SH EXAMPLES
-.EX "rmdir /user/ast/foobar" "Remove directory \fIfoobar\fP"
-.EX "rmdir /user/ast/f*" "Remove 0 or more directories"
-.SH DESCRIPTION
-.PP
-The specified directories are removed.
-Ordinary files are not removed.
-The directories must be empty.
-.SH "SEE ALSO"
-.BR mkdir (1),
-.BR rmdir (2).