===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandoc.1,v
retrieving revision 1.62
retrieving revision 1.63
diff -c -r1.62 -r1.63
*** src/usr.bin/mandoc/mandoc.1	2014/09/03 05:17:08	1.62
--- src/usr.bin/mandoc/mandoc.1	2014/10/07 18:17:05	1.63
***************
*** 1,4 ****
! .\"	$OpenBSD: mandoc.1,v 1.62 2014/09/03 05:17:08 schwarze Exp $
  .\"
  .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  .\" Copyright (c) 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! .\"	$OpenBSD: mandoc.1,v 1.63 2014/10/07 18:17:05 schwarze Exp $
  .\"
  .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  .\" Copyright (c) 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 15,21 ****
  .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
! .Dd $Mdocdate: September 3 2014 $
  .Dt MANDOC 1
  .Os
  .Sh NAME
--- 15,21 ----
  .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
! .Dd $Mdocdate: October 7 2014 $
  .Dt MANDOC 1
  .Os
  .Sh NAME
***************
*** 233,239 ****
  See
  .Sx ASCII Output .
  .It Fl T Ns Cm html
! Produce strict CSS1/HTML-4.01 output.
  See
  .Sx HTML Output .
  .It Fl T Ns Cm lint
--- 233,239 ----
  See
  .Sx ASCII Output .
  .It Fl T Ns Cm html
! Produce CSS1/HTML5 output.
  See
  .Sx HTML Output .
  .It Fl T Ns Cm lint
***************
*** 265,273 ****
  See
  .Sx UTF\-8 Output .
  .It Fl T Ns Cm xhtml
! Produce strict CSS1/XHTML-1.0 output.
! See
! .Sx XHTML Output .
  .El
  .Pp
  If multiple input files are specified, these will be processed by the
--- 265,272 ----
  See
  .Sx UTF\-8 Output .
  .It Fl T Ns Cm xhtml
! This is a synonym for
! .Fl T Ns Cm html .
  .El
  .Pp
  If multiple input files are specified, these will be processed by the
***************
*** 320,326 ****
  .Ss HTML Output
  Output produced by
  .Fl T Ns Cm html
! conforms to HTML-4.01 strict.
  .Pp
  The
  .Pa example.style.css
--- 319,325 ----
  .Ss HTML Output
  Output produced by
  .Fl T Ns Cm html
! conforms to HTML5 using optional self-closing tags.
  .Pp
  The
  .Pa example.style.css
***************
*** 328,334 ****
  If a style-sheet is not specified with
  .Fl O Ns Ar style ,
  .Fl T Ns Cm html
! defaults to simple output readable in any graphical or text-based web
  browser.
  .Pp
  Special characters are rendered in decimal-encoded UTF\-8.
--- 327,334 ----
  If a style-sheet is not specified with
  .Fl O Ns Ar style ,
  .Fl T Ns Cm html
! defaults to simple output (via an embedded style-sheet)
! readable in any graphical or text-based web
  browser.
  .Pp
  Special characters are rendered in decimal-encoded UTF\-8.
***************
*** 471,485 ****
  See
  .Sx Locale Output
  for details and options.
- .Ss XHTML Output
- Output produced by
- .Fl T Ns Cm xhtml
- conforms to XHTML-1.0 strict.
- .Pp
- See
- .Sx HTML Output
- for details; beyond generating XHTML tags instead of HTML tags, these
- output modes are identical.
  .Sh ENVIRONMENT
  .Bl -tag -width MANPAGER
  .It Ev MANPAGER
--- 471,476 ----
***************
*** 670,676 ****
  .It
  Words aren't hyphenated.
  .El
! .Ss HTML/XHTML Compatibility
  .Bl -bullet -compact
  .It
  The
--- 661,667 ----
  .It
  Words aren't hyphenated.
  .El
! .Ss HTML Compatibility
  .Bl -bullet -compact
  .It
  The