summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2010-01-03 23:29:04 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2010-01-03 23:29:04 +0000
commit635b221696b5e4e2968ead5c9daa8680bdd307d7 (patch)
tree03e4dfdfce76641d7c1218c06d0a5e1e44f2d56b
parent8028f6a67fe786e34cdc97e0f80c7fe8ce12194b (diff)
This is not intended to document just the mandoc(1) program, but rather
man(7) and mdoc(7) special characters and predefined strings in general; just as mandoc(1) is not intending to implement new languages, but provide standard formatting for man(7) and mdoc(7) files, whatever "standard" may mean in this context (sigh). So move this to the right place. noticed by deraadt@
-rw-r--r--share/man/man7/Makefile5
-rw-r--r--share/man/man7/mandoc_char.7 (renamed from usr.bin/mandoc/mandoc_char.7)4
-rw-r--r--usr.bin/mandoc/Makefile3
3 files changed, 6 insertions, 6 deletions
diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index 29db1650d7f..e5c1ce77309 100644
--- a/share/man/man7/Makefile
+++ b/share/man/man7/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2009/03/05 15:13:30 millert Exp $
+# $OpenBSD: Makefile,v 1.15 2010/01/03 23:29:03 schwarze Exp $
# $NetBSD: Makefile,v 1.6 1994/12/22 10:50:05 cgd Exp $
# missing: eqnchar.7 man.7 ms.7 term.7
MAN= ascii.7 environ.7 glob.7 hier.7 hostname.7 intro.7 kgdb.7 \
- library-specs.7 mailaddr.7 mdoc.7 mdoc.samples.7 mirroring-ports.7 \
+ library-specs.7 mailaddr.7 \
+ mandoc_char.7 mdoc.7 mdoc.samples.7 mirroring-ports.7 \
operator.7 packages.7 packages-specs.7 ports.7 script.7 securelevel.7
MLINKS= mdoc.7 mandoc.7 mdoc.samples.7 mandoc.samples.7 \
mirroring-ports.7 mirror-maker.7
diff --git a/usr.bin/mandoc/mandoc_char.7 b/share/man/man7/mandoc_char.7
index b74f62318d1..53dfa0819fc 100644
--- a/usr.bin/mandoc/mandoc_char.7
+++ b/share/man/man7/mandoc_char.7
@@ -1,4 +1,4 @@
-.\" $Id: mandoc_char.7,v 1.8 2009/12/24 02:08:14 schwarze Exp $
+.\" $Id: mandoc_char.7,v 1.1 2010/01/03 23:29:03 schwarze Exp $
.\"
.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: December 24 2009 $
+.Dd $Mdocdate: January 3 2010 $
.Dt MANDOC_CHAR 7
.Os
.
diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index 3568e3302a4..b50185ed6ba 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2010/01/03 19:59:59 schwarze Exp $
+# $OpenBSD: Makefile,v 1.27 2010/01/03 23:29:03 schwarze Exp $
.include <bsd.own.mk>
@@ -18,6 +18,5 @@ SRCS+= main.c mdoc_term.c chars.c term.c tree.c man_term.c
SRCS+= html.c mdoc_html.c man_html.c out.c
PROG= mandoc
-MAN= mandoc.1 mandoc_char.7
.include <bsd.prog.mk>