[groff] 01/01: src/roff/nroff/*: Improve the license information.

[Bernd Warken]

bwarken pushed a commit to branch master
in repository groff.

commit b655cfa0087bee6e67e0954f58f00a739f2e227b
Author: Bernd Warken <address@hidden>
Date:   Thu Sep 18 03:14:38 2014 +0200

    src/roff/nroff/*: Improve the license information.
---
 ChangeLog                   |    4 +++
 src/roff/nroff/Makefile.sub |    5 +---
 src/roff/nroff/nroff.man    |   59 ++++++++++++++++++++++++++++++++++--------
 src/roff/nroff/nroff.sh     |    4 +--
 4 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 449eaec..b4265d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-09-18  Bernd Warken  <address@hidden>
 
+       * src/roff/nroff/*: Improve the license information.
+
+2014-09-18  Bernd Warken  <address@hidden>
+
        * src/roff/grog/*: Improve the license information.
 
 2014-09-18  Bernd Warken  <address@hidden>
diff --git a/src/roff/nroff/Makefile.sub b/src/roff/nroff/Makefile.sub
index d135481..473c4c7 100644
--- a/src/roff/nroff/Makefile.sub
+++ b/src/roff/nroff/Makefile.sub
@@ -2,10 +2,7 @@
 #
 # File position: <groff-source>/src/roff/nroff/Makefile.sub
 #
-# Copyright (C) 2014
-#   Free Software Foundation, Inc.
-#
-# Last update: 2 Sep 2014
+# Copyright (C) 2014  Free Software Foundation, Inc.
 #
 # This file is part of `font utf8' which is part of `groff'.
 #
diff --git a/src/roff/nroff/nroff.man b/src/roff/nroff/nroff.man
index 54c6427..f5132f0 100644
--- a/src/roff/nroff/nroff.man
+++ b/src/roff/nroff/nroff.man
@@ -1,6 +1,11 @@
-.ig
-Copyright (C) 1989-2001, 2002, 2003, 2005, 2007, 2009
-  Free Software Foundation, Inc.
+.TH @address@hidden @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.SH NAME
address@hidden@nroff \- emulate nroff command with groff
+.
+.
+.\" Legal Terms
+.de co
+Copyright (C) 1989-2014  Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -18,12 +23,9 @@ translations approved by the Free Software Foundation 
instead of in
 the original English.
 ..
 .
-.TH @address@hidden @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
-.
-.SH NAME
address@hidden@nroff \- emulate nroff command with groff
-.
+.\" --------------------------------------------------------------------
 .SH SYNOPSIS
+.\" --------------------------------------------------------------------
 .
 .\" Redefine OP because no spaces are allowed after an option's argument.
 .de OP
@@ -53,12 +55,16 @@ the original English.
 .B \-\-version
 .YS
 .
+.\" --------------------------------------------------------------------
 .SH DESCRIPTION
+.\" --------------------------------------------------------------------
+.
 The
 .B @address@hidden
 script emulates the
 .B nroff
 command using groff.
+.
 Only
 .BR ascii ,
 .BR latin1 ,
@@ -69,7 +75,8 @@ are devices accepted by
 .BR nroff
 to select the output encoding emitted by
 .BR grotty ,
-groff's TTY output device.
+groff\[aq]s TTY output device.
+.
 If neither the
 .B GROFF_TYPESETTER
 environment variable nor the
@@ -78,6 +85,7 @@ command line option (which overrides the environment variable)
 specifies a (valid) device,
 .B @address@hidden
 checks the current locale to select a default output device.
+.
 It first tries the
 .B locale
 program, then the environment variables
@@ -88,6 +96,8 @@ and
 and finally the
 .B LESSCHARSET
 environment variable.
+.
+.
 .PP
 The
 .B \-h
@@ -95,12 +105,13 @@ and
 .B \-c
 options
 are equivalent to
-.BR grotty 's
+.BR grotty \[aq]s
 options
 .B \-h
 (using tabs in the output) and
 .B \-c
 (using the old output scheme instead of SGR escape sequences).
+.
 The
 .BR \-d ,
 .BR \-C ,
@@ -115,6 +126,7 @@ and
 .B \-W
 options have the effect described in
 .BR @address@hidden (@MAN1EXT@).
+.
 In addition,
 .B @address@hidden
 silently ignores the options
@@ -124,6 +136,7 @@ and
 .BR \-s
 (which are not implemented in
 .BR @address@hidden ).
+.
 Options
 .B \-p
 (pic),
@@ -134,6 +147,7 @@ Options
 .B \-U
 (unsafe) are passed to
 .BR groff .
+.
 .B \-v
 and
 .B \-\-version
@@ -141,32 +155,53 @@ show the version number,
 .B \-\-help
 prints a help message.
 .
+.
+.\" --------------------------------------------------------------------
 .SH ENVIRONMENT
+.\" --------------------------------------------------------------------
+.
 .TP
 .SM
 .B GROFF_TYPESETTER
 The default device for
 .BR groff .
-If not set (which is the normal case), it defaults to `ps'.
+If not set (which is the normal case), it defaults to \[oq]ps\[cq].
 .
 .TP
 .SM
 .B GROFF_BIN_PATH
 A colon separated list of directories in which to search for the
 .B groff
-executable before searching in PATH.  If unset, address@hidden@' is used.
+executable before searching in PATH.
+.
+If unset, address@hidden@\[cq] is used.
 .
+.
+.\" --------------------------------------------------------------------
 .SH NOTES
+.\" --------------------------------------------------------------------
+.
 This shell script is basically intended for use with
 .BR man (1).
 nroff-style character definitions (in the file tty-char.tmac) are also
 loaded to emulate unrepresentable glyphs.
 .
+.
+.\" --------------------------------------------------------------------
 .SH "SEE ALSO"
+.\" --------------------------------------------------------------------
+.
 .BR groff (@MAN1EXT@),
 .BR @address@hidden (@MAN1EXT@),
 .BR grotty (@MAN1EXT@)
 .
+.
+.\" --------------------------------------------------------------------
+.SH COPYING
+.\" --------------------------------------------------------------------
+.co
+.
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
diff --git a/src/roff/nroff/nroff.sh b/src/roff/nroff/nroff.sh
index d4bd8a0..fb227b3 100644
--- a/src/roff/nroff/nroff.sh
+++ b/src/roff/nroff/nroff.sh
@@ -1,9 +1,7 @@
 #! /bin/sh
 # Emulate nroff with groff.
 #
-# Copyright (C) 1992, 1993, 1994, 1999, 2000, 2001, 2002, 2003,
-#               2004, 2005, 2007, 2009
-#   Free Software Foundation, Inc.
+# Copyright (C) 1992-2014  Free Software Foundation, Inc.
 #
 # Written by James Clark, maintained by Werner Lemberg.