Correct use of .Nm. Add rcsid.

7 files changed, 39 insertions, 25 deletions

diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index f054c7a0eb75..f9e6e708447c 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 035fb76bef4c..6e66537f5d8a 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 d690bec19e01..83eec2a517d1 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 21eb853e5501..8f4f0132f640 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 668dcd9962b1..d2ac6bfa09fd 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 2e047f61fe06..b2965a86ba0e 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 9da17e19808d..f54ac42dc053 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>