Correct use of .Nm. Add rcsid.

12 files changed, 66 insertions, 46 deletions

diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1
index 0059ac1..679e78d 100644
--- a/bin/sleep/sleep.1
+++ b/bin/sleep/sleep.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: sleep.1,v 1.6 1997/02/22 14:05:44 peter Exp $
+.\"	$Id: sleep.1,v 1.7 1997/08/12 21:20:12 ache Exp $
 .\"
 .Dd April 18, 1994
 .Dt SLEEP 1
@@ -46,17 +46,17 @@
 .Ar seconds
 .Sh DESCRIPTION
 The
-.Nm sleep
+.Nm
 command
 suspends execution for a minimum of
 .Ar seconds .
-.Nm
+.Nm Sleep
 is used to schedule the execution of other commands (see
 .Sx EXAMPLES
 below).
 .Pp
 If the
-.Nm sleep
+.Nm
 command
 receives a SIGALRM signal, it terminates normally with a zero exit status,
 for any other signal it takes the standard action.
@@ -117,7 +117,7 @@ awk job.
 .Xr sleep 3
 .Sh STANDARDS
 The
-.Nm sleep
+.Nm
 command is expected to be
 .St -p1003.2
 compatible.
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index d11dd07..58f3bc8 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.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: sleep.c,v 1.5 1997/02/22 14:05:45 peter Exp $
  */
 
 #ifndef lint
@@ -40,7 +38,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)sleep.c	8.3 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)sleep.c	8.3 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index f054c7a..f9e6e70 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.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[] = "@(#)cchar.c	8.5 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)cchar.c	8.5 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index 035fb76..6e66537 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.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[] = "@(#)gfmt.c	8.6 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)gfmt.c	8.6 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index d690bec..83eec2a 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.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[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/print.c b/bin/stty/print.c
index 21eb853..8f4f013 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.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: print.c,v 1.8 1997/02/22 14:05:53 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
+#if 0
+static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 668dcd9..d2ac6bf 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\"	$Id: stty.1,v 1.7 1997/03/12 15:59:22 mpp Exp $
+.\"	$Id: stty.1,v 1.8 1997/06/02 06:32:26 charnier Exp $
 .\"
 .Dd April 18, 1994
 .Dt STTY 1
@@ -48,7 +48,7 @@
 .Op operands
 .Sh DESCRIPTION
 The
-.Nm stty
+.Nm
 utility sets or reports on terminal
 characteristics for the device that is its standard input.
 If no options or operands are specified, it reports the settings of a subset
@@ -60,7 +60,7 @@ Some combinations of arguments are mutually
 exclusive on some terminal types.
 .Pp
 The following options are available:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl a
 Display all the current settings for the terminal to standard output
 as per
@@ -84,7 +84,7 @@ block on the open.
 .It Fl g
 Display all the current settings for the terminal to standard output
 in a form that may be used as an argument to a subsequent invocation of
-.Nm stty
+.Nm
 to restore the current terminal state as per
 .St -p1003.2 .
 .El
@@ -493,7 +493,9 @@ first rows, then columns.
 .Ss Compatibility Modes:
 .Pp
 These modes remain for compatibility with the previous version of
-the stty command.
+the
+.Nm
+command.
 .Bl -tag -width Fl
 .It Cm all
 Reports all the terminal modes as with
@@ -564,13 +566,13 @@ Same as the control character
 .El
 .Pp
 The
-.Nm stty
+.Nm
 utility exits with a value of 0 if successful, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr termios 4
 .Sh STANDARDS
 The
-.Nm stty
+.Nm
 function is expected to be
 .St -p1003.2
 compatible.  The flags
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index 2e047f6..b2965a8 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.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: stty.c,v 1.10 1997/03/28 15:24:41 imp Exp $
  */
 
 #ifndef lint
@@ -40,7 +38,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)stty.c	8.3 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)stty.c	8.3 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/util.c b/bin/stty/util.c
index 9da17e1..f54ac42 100644
--- a/bin/stty/util.c
+++ b/bin/stty/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.3 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/test/operators.c b/bin/test/operators.c
index e75c84a..d21ec03 100644
--- a/bin/test/operators.c
+++ b/bin/test/operators.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[] = "@(#)operators.c	8.3 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)operators.c	8.3 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 /*
diff --git a/bin/test/test.1 b/bin/test/test.1
index fd8f999..d6125a4 100644
--- a/bin/test/test.1
+++ b/bin/test/test.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: test.1,v 1.4 1997/02/22 14:06:23 peter Exp $
+.\"	$Id: test.1,v 1.5 1997/06/02 06:33:51 charnier Exp $
 .\"
 .Dd May 31, 1993
 .Dt TEST 1
@@ -46,7 +46,7 @@
 .Ar expression
 .Sh DESCRIPTION
 The
-.Nm test
+.Nm
 utility evaluates the expression and, if it evaluates
 to true, returns a zero (true) exit status; otherwise
 it returns 1 (false).
@@ -54,11 +54,11 @@ If there is no expression, test also
 returns 1 (false).
 .Pp
 All operators and flags are separate arguments to the
-.Nm test
+.Nm
 utility.
 .Pp
 The following primaries are used to construct expression:
-.Bl -tag -width Ar
+.Bl -tag -width indent
 .It Fl b Ar file
 True if
 .Ar file
@@ -228,7 +228,7 @@ operator has higher precedence than the
 operator.
 .Sh GRAMMAR AMBIGUITY
 The 
-.Nm test
+.Nm
 grammar is inherently ambiguous.  In order to assure a degree of consistency,
 the cases described in the 
 .St -p1003.2 , 
@@ -238,7 +238,7 @@ standards document.  All other cases are subject to the ambiguity in the
 command semantics.
 .Sh RETURN VALUES
 The
-.Nm test
+.Nm
 utility exits with one of the following values:
 .Bl -tag -width Ds
 .It 0
@@ -251,7 +251,7 @@ An error occurred.
 .El
 .Sh STANDARDS
 The
-.Nm test
+.Nm
 function is expected to be
 .St -p1003.2
 compatible.
diff --git a/bin/test/test.c b/bin/test/test.c
index d74b299..16f8042 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -32,8 +32,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: test.c,v 1.17 1997/02/22 14:06:25 peter Exp $
  */
 
 #ifndef lint
@@ -43,7 +41,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)test.c	8.3 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)test.c	8.3 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>