diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-11-05 17:47:54 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-11-05 17:47:54 +0000 |
| commit | 8dfee69a662f2a5cc221a955c84b7970b017d884 (patch) | |
| tree | f658a32edd96045babdd9f1090681bc01ffaa1ff | |
| parent | 9774da0661d5a1862f2661f3bf6bcb6bfeb4044f (diff) | |
simplify: use one stylesheet rather than two; from bentley@
| -rw-r--r-- | usr.bin/mandoc/cgi.c | 8 | ||||
| -rw-r--r-- | usr.bin/mandoc/man.cgi.8 | 13 | ||||
| -rw-r--r-- | usr.bin/mandoc/mandoc.1 | 10 |
3 files changed, 12 insertions, 19 deletions
diff --git a/usr.bin/mandoc/cgi.c b/usr.bin/mandoc/cgi.c index d50d7391acb..88aa391c742 100644 --- a/usr.bin/mandoc/cgi.c +++ b/usr.bin/mandoc/cgi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgi.c,v 1.51 2015/10/22 22:05:42 schwarze Exp $ */ +/* $OpenBSD: cgi.c,v 1.52 2015/11/05 17:47:53 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@usta.de> @@ -375,15 +375,13 @@ resp_begin_html(int code, const char *msg) "<HTML>\n" "<HEAD>\n" "<META CHARSET=\"UTF-8\" />\n" - "<LINK REL=\"stylesheet\" HREF=\"%s/man-cgi.css\"" - " TYPE=\"text/css\" media=\"all\">\n" - "<LINK REL=\"stylesheet\" HREF=\"%s/man.css\"" + "<LINK REL=\"stylesheet\" HREF=\"%s/mandoc.css\"" " TYPE=\"text/css\" media=\"all\">\n" "<TITLE>%s</TITLE>\n" "</HEAD>\n" "<BODY>\n" "<!-- Begin page content. //-->\n", - CSS_DIR, CSS_DIR, CUSTOMIZE_TITLE); + CSS_DIR, CUSTOMIZE_TITLE); } static void diff --git a/usr.bin/mandoc/man.cgi.8 b/usr.bin/mandoc/man.cgi.8 index 3113a868af4..19087611aae 100644 --- a/usr.bin/mandoc/man.cgi.8 +++ b/usr.bin/mandoc/man.cgi.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: man.cgi.8,v 1.10 2014/09/14 19:44:20 schwarze Exp $ +.\" $OpenBSD: man.cgi.8,v 1.11 2015/11/05 17:47:53 schwarze Exp $ .\" .\" Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> .\" @@ -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: September 14 2014 $ +.Dd $Mdocdate: November 5 2015 $ .Dt MAN.CGI 8 .Os .Sh NAME @@ -344,15 +344,10 @@ Can be overridden by The path to the server document root relative to the server root. This is part of the web server configuration and not specific to .Nm . -.It Pa /htdocs/man-cgi.css -A style sheet for general -.Nm -styling, referenced from each generated HTML page. -.It Pa /htdocs/man.css +.It Pa /htdocs/mandoc.css A style sheet for .Xr mandoc 1 -HTML styling, referenced from each generated HTML page after -.Pa man-cgi.css . +HTML styling, referenced from each generated HTML page. .It Pa /man Default .Nm diff --git a/usr.bin/mandoc/mandoc.1 b/usr.bin/mandoc/mandoc.1 index 3500983b2e4..3b942c9ceb2 100644 --- a/usr.bin/mandoc/mandoc.1 +++ b/usr.bin/mandoc/mandoc.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mandoc.1,v 1.87 2015/10/30 19:03:36 schwarze Exp $ +.\" $OpenBSD: mandoc.1,v 1.88 2015/11/05 17:47:53 schwarze Exp $ .\" .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> .\" Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -15,7 +15,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: October 30 2015 $ +.Dd $Mdocdate: November 5 2015 $ .Dt MANDOC 1 .Os .Sh NAME @@ -349,7 +349,7 @@ Equations rendered from blocks use MathML. .Pp The -.Pa example.style.css +.Pa mandoc.css file documents style-sheet classes available for customising output. If a style-sheet is not specified with .Fl O Cm style , @@ -601,10 +601,10 @@ To page manuals to the terminal: .Dl $ mandoc mandoc.1 mdoc.3 mdoc.7 | less .Pp To produce HTML manuals with -.Ar style.css +.Pa mandoc.css as the style-sheet: .Pp -.Dl $ mandoc \-T html -O style=style.css mdoc.7 \*(Gt mdoc.7.html +.Dl $ mandoc \-T html -O style=mandoc.css mdoc.7 \*(Gt mdoc.7.html .Pp To check over a large set of manuals: .Pp |