summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2017-05-17 23:39:15 +0000
committerschwarze <schwarze@openbsd.org>2017-05-17 23:39:15 +0000
commit4f62279ee7eab4faeef87d237a58e64a2b8d31e1 (patch)
tree4bb0a1bb3a988aa8b9375aebf57f44b70700448e
parentFix documentation bug: (diff)
downloadwireguard-openbsd-4f62279ee7eab4faeef87d237a58e64a2b8d31e1.tar.xz
wireguard-openbsd-4f62279ee7eab4faeef87d237a58e64a2b8d31e1.zip
Delete the -T xhtml command line option.
It has been obsolete for more than two years. Use -T html.
-rw-r--r--share/man/man7/mandoc_char.78
-rw-r--r--usr.bin/mandoc/main.c4
-rw-r--r--usr.bin/mandoc/mandoc.15
3 files changed, 5 insertions, 12 deletions
diff --git a/share/man/man7/mandoc_char.7 b/share/man/man7/mandoc_char.7
index f24a2b4fb45..532136a3d88 100644
--- a/share/man/man7/mandoc_char.7
+++ b/share/man/man7/mandoc_char.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mandoc_char.7,v 1.29 2017/04/30 15:05:27 schwarze Exp $
+.\" $OpenBSD: mandoc_char.7,v 1.30 2017/05/17 23:39:15 schwarze Exp $
.\"
.\" Copyright (c) 2003 Jason McIntyre <jmc@openbsd.org>
.\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -16,7 +16,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: April 30 2017 $
+.Dd $Mdocdate: May 17 2017 $
.Dt MANDOC_CHAR 7
.Os
.Sh NAME
@@ -752,9 +752,7 @@ the
differently between mandoc and groff.
.It
In
-.Fl T Ns Cm html
-and
-.Fl T Ns Cm xhtml ,
+.Fl T Ns Cm html ,
the \e(\(ti=, \e(nb, and \e(nc special characters render differently
between mandoc and groff.
.It
diff --git a/usr.bin/mandoc/main.c b/usr.bin/mandoc/main.c
index 2165b2ef0e8..c029f485c03 100644
--- a/usr.bin/mandoc/main.c
+++ b/usr.bin/mandoc/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.193 2017/05/16 19:05:36 schwarze Exp $ */
+/* $OpenBSD: main.c,v 1.194 2017/05/17 23:39:15 schwarze Exp $ */
/*
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -920,8 +920,6 @@ toptions(struct curparse *curp, char *arg)
curp->outtype = OUTT_UTF8;
else if (0 == strcmp(arg, "locale"))
curp->outtype = OUTT_LOCALE;
- else if (0 == strcmp(arg, "xhtml"))
- curp->outtype = OUTT_HTML;
else if (0 == strcmp(arg, "ps"))
curp->outtype = OUTT_PS;
else if (0 == strcmp(arg, "pdf"))
diff --git a/usr.bin/mandoc/mandoc.1 b/usr.bin/mandoc/mandoc.1
index 5dd8fff62ff..155102a33f1 100644
--- a/usr.bin/mandoc/mandoc.1
+++ b/usr.bin/mandoc/mandoc.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mandoc.1,v 1.111 2017/05/17 23:20:00 schwarze Exp $
+.\" $OpenBSD: mandoc.1,v 1.112 2017/05/17 23:39:15 schwarze Exp $
.\"
.\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
.\" Copyright (c) 2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -253,9 +253,6 @@ See
Encode output in the UTF\-8 multi-byte format.
See
.Sx UTF\-8 Output .
-.It Fl T Cm xhtml
-This is a synonym for
-.Fl T Cm html .
.El
.Pp
If multiple input files are specified, these will be processed by the