1 files changed, 136 insertions, 29 deletions
diff --git a/share/misc/docbook.css b/share/misc/docbook.css
index 22a430f2dd..8c1bf85571 100644
--- a/share/misc/docbook.css
+++ b/share/misc/docbook.css
@@ -26,15 +26,82 @@
  * $FreeBSD$
  */
 
-body address {
-	line-height: 1.3;
-	margin: .6em 0;
+/*
+ * General DocBook styles from the DocBook XSL distribution
+ */
+
+.formalpara-title {
+  font-weight: bold;
+}
+
+div.blockquote-title {
+  font-weight: bold;
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msgmain-title {
+  font-weight: bold;
+}
+
+span.msgsub-title {
+  font-weight: bold;
+}
+
+span.msgrel-title {
+  font-weight: bold;
+}
+
+div.msglevel, div.msgorig, div.msgaud {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msglevel-title, span.msgorig-title, span.msgaud-title {
+  font-weight: bold;
+}
+
+div.msgexplan {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msgexplan-title {
+  font-weight: bold;
+}
+
+div.figure-title {
+  font-weight: bold;
+}
+
+div.example-title {
+  font-weight: bold;
+}
+
+div.equation-title {
+  font-weight: bold;
+}
+
+div.table-title {
+  font-weight: bold;
+}
+
+div.sidebar-title {
+  font-weight: bold;
 }
 
-body blockquote {
-	margin-top: .75em;
+div.synopsis {
+  white-space: pre;
+  font-family: monospace;
+}
+
+/*
+ * FreeBSD-specific formatting
+ */
+
+body address {
 	line-height: 1.3;
-	margin-bottom: .75em;
+	margin: .6em 0;
 }
 
 html body {
@@ -70,7 +137,6 @@ body form {
 	margin: .6em 0;
 }
 
-h1, h2, h3, h4, h5, h6,
 div.example p b,
 .question,
 div.table p b,
@@ -78,24 +144,33 @@ div.procedure p b {
 	color: #990000;
 }
 
-body h1, body h2, body h3, body h4, body h5, body h6 {
+h1.title, h2.title, h3.title, h4.title, h5.title, h6.title,
+h3.author, .corpauthor,
+div.abstract div.abstract-title,
+div.toc div.toc-title,
+div.list-of-figures div.toc-title,
+div.list-of-tables div.toc-title,
+div.list-of-examples div.toc-title {
+	font-weight: bold;
 	line-height: 1.3;
+	margin-top: 1em;
 	margin-left: 0;
+	color: #990000;
 }
 
-body h1, body h2 {
+h1.title, h2.title {
 	margin: .8em 0 0 -4%;
 }
 
-body h3, body h4 {
+h3.title, h4.title {
 	margin: .8em 0 0 -3%;
 }
 
-body h5 {
+h5.title {
 	margin: .8em 0 0 -2%;
 }
 
-body h6 {
+h6.title {
 	margin: .8em 0 0 -1%;
 }
 
@@ -135,15 +210,11 @@ html {
 	padding: 0;
 }
 
-body p b.application {
-	color: #000000;
-}
-
 .filename {
 	color: #007a00;
 }
 
-svnref {
+.svnref {
 	color: #007a00;
 }
 
@@ -163,14 +234,19 @@ svnref {
 	text-decoration: underline;
 }
 
-.screen {
+div.screen {
+	white-space: pre;
+	font-family: monospace;
 	padding: 1ex;
 }
 
-.programlisting {
+div.programlisting {
+	white-space: pre;
+	font-family: monospace;
 	padding: 1ex;
 	background-color: #eee;
 	border: 1px solid #ccc;
+	border-radius: 6px;
 	line-height: 1.1;
 }
 
@@ -183,42 +259,41 @@ svnref {
 	text-align: left;
 }
 
-blockquote, .example, .programlisting {
+.note, .tip, .important, .warning, .caution, .example, div.procedure {
 	border-radius: 6px;
+	padding: 2ex 2ex;
+	margin: .75em 3em .75em 3em;
+        line-height: 1.3;
 }
 
-blockquote {
-	padding: 0 2ex;
-}
-
-blockquote.note {
+.note, div.procedure {
 	color: #222;
 	background: #eee;
 	border: 1px solid #ccc;
 	width: 85%;
 }
 
-blockquote.tip {
+.tip {
 	color: #004F00;
 	background: #d8ecd6;
 	border: 1px solid green;
 	width: 85%;
 }
 
-blockquote.important {
+.important {
 	font-style:italic;
 	border: 1px solid #a00;
 	border-left: 12px solid #c00;
 }
 
-blockquote.warning {
+.warning {
 	color: #9F1313;
 	background: #f8e8e8;
 	border: 1px solid #e59595;
 	width: 85%;
 }
 
-blockquote.caution {
+.caution {
 	color: #3E3535;
 	background: #FFC;
 	border: 1px solid #e59595;
@@ -233,7 +308,39 @@ blockquote.caution {
 	width: 90%;
 }
 
+.admontitle {
+	display: inline;
+	line-height: 1;
+	margin-right: 0;
+}
+
+.procedure-title {
+	font-weight: bold;
+        line-height: 1;
+        margin-right: 0;
+}
+
+.note p, .tip p, .important p, .warning p, .caution p, .example p {
+	display: inline;
+}
+
 .informaltable table.calstable tr td {
         padding-left: 1em;
         padding-right: 1em;
 }
+
+.authorgroup {
+	font-style: italic;
+}
+
+.application {
+	font-weight: bold;
+}
+
+.userinput {
+	font-weight: normal;
+}
+
+pre.screen strong {
+	font-weight: normal;
+}