Correct use of .Nm. Add rcsid.

5 files changed, 37 insertions, 36 deletions

diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index 0258b83..81a7a04 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rcp.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: rcp.1,v 1.5 1997/02/22 14:05:21 peter Exp $
 .\"
 .Dd May 31, 1993
 .Dt RCP 1
@@ -58,26 +58,21 @@ argument is either a remote file name of the
 form ``rname@rhost:path'', or a local file name (containing no `:' characters,
 or a `/' before any `:'s).
 .Pp
-.Bl -tag -width flag
+The following options are available:
+.Bl -tag -width indent
 .It Fl K
-The
-.Fl K
-option turns off all Kerberos authentication.
+Turn off all Kerberos authentication.
 .It Fl k
-The
-.Fl k
-option requests
-.Nm rcp
+Request
+.Nm
 to obtain tickets
 for the remote host in realm
 .Ar realm
 instead of the remote host's realm as determined by
 .Xr krb_realmofhost  3  .
 .It Fl p
-The
-.Fl p
-option causes
-.Nm rcp
+Cause
+.Nm
 to attempt to preserve (duplicate) in its copies the modification
 times and modes of the source files, ignoring the
 .Ar umask  .
@@ -89,16 +84,14 @@ modified by the
 on the destination host is used.
 .It Fl r
 If any of the source files are directories,
-.Nm rcp
+.Nm
 copies each subtree rooted at that name; in this case
 the destination must be a directory.
 .It Fl x
-The
-.Fl x
-option turns on
+Turn on
 .Tn DES
 encryption for all data passed by
-.Nm rcp .
+.Nm Ns .
 This may impact response time and
 .Tn CPU
 utilization, but provides
@@ -134,11 +127,11 @@ are on the current machine.
 .Xr rsh 1
 .Sh HISTORY
 The
-.Nm rcp
+.Nm
 command appeared in
 .Bx 4.2 .
 The version of
-.Nm rcp
+.Nm
 described here
 has been reimplemented with Kerberos in
 .Bx 4.3 Reno .
@@ -157,4 +150,4 @@ The destination user and hostname may have to be specified as
 ``rhost.rname'' when the destination machine is running the
 .Bx 4.2
 version of
-.Nm rcp  .
+.Nm Ns  .
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index ec40f1c..c8c662b 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -29,8 +29,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id$
  */
 
 #ifndef lint
@@ -40,7 +38,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index d9fedb5..c7de9f6 100644
--- a/bin/rcp/util.c
+++ b/bin/rcp/util.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id$
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)util.c	8.2 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)util.c	8.2 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index 44eed96..086ad3a 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rmdir.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: rmdir.1,v 1.6 1997/02/22 14:05:37 peter Exp $
 .\"
 .Dd May 31, 1993
 .Dt RMDIR 1
@@ -46,7 +46,9 @@
 .Op Fl p
 .Ar directory ...
 .Sh DESCRIPTION
-The rmdir utility removes the directory entry specified by
+The
+.Nm
+utility removes the directory entry specified by
 each
 .Ar directory
 argument, provided it is empty.
@@ -56,11 +58,11 @@ In order to remove both a parent directory and a subdirectory
 of that parent, the subdirectory
 must be specified first so the parent directory
 is empty when
-.Nm rmdir
+.Nm
 tries to remove it.
 .Pp
 The following option is available:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl p
 Each
 .Ar directory
@@ -73,7 +75,7 @@ for fully non-discriminant recursive removal.)
 .El
 .Pp
 The
-.Nm rmdir
+.Nm
 utility exits with one of the following values:
 .Bl -tag -width Ds
 .It Li \&0
@@ -87,7 +89,7 @@ An error occurred.
 .Xr rm 1
 .Sh STANDARDS
 The
-.Nm rmdir
+.Nm
 command is expected to be
 .St -p1003.2
 compatible.
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index d6d1347..6b31c5a 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -29,8 +29,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: rmdir.c,v 1.6 1997/03/28 15:24:37 imp Exp $
  */
 
 #ifndef lint
@@ -40,7 +38,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)rmdir.c	8.3 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)rmdir.c	8.3 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <err.h>