- Fix formatting of warning, tip, etc.

2 files changed, 46 insertions, 17 deletions

diff --git a/share/misc/docbook.css b/share/misc/docbook.css
index fbcd1214e6..a173736976 100644
--- a/share/misc/docbook.css
+++ b/share/misc/docbook.css
@@ -31,12 +31,6 @@ body address {
 	margin: .6em 0;
 }
 
-body blockquote {
-	margin-top: .75em;
-	line-height: 1.3;
-	margin-bottom: .75em;
-}
-
 html body {
 	margin: 1em 8% 1em 10%;
 	line-height: 1.2;
@@ -70,7 +64,6 @@ body form {
 	margin: .6em 0;
 }
 
-h1, h2, h3, h4, h5, h6,
 div.example p b,
 .question,
 div.table p b,
@@ -78,24 +71,26 @@ 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 {
 	line-height: 1.3;
 	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%;
 }
 
@@ -167,6 +162,7 @@ svnref {
 	padding: 1ex;
 	background-color: #eee;
 	border: 1px solid #ccc;
+	border-radius: 6px;
 	line-height: 1.1;
 }
 
@@ -179,12 +175,11 @@ svnref {
 	text-align: left;
 }
 
-blockquote, .example, .programlisting {
+.note, .tip, .important, .warning, .caution, .example {
 	border-radius: 6px;
-}
-
-blockquote {
-	padding: 0 2ex;
+	padding: 2ex 2ex;
+	margin: .75em 3em .75em 3em;
+        line-height: 1.3;
 }
 
 .note {
@@ -229,6 +224,16 @@ blockquote {
 	width: 90%;
 }
 
+.admontitle {
+	display: inline;
+	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;
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index dfff3249a9..a4507b330b 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -17,6 +17,7 @@
   <xsl:param name="link.mailto.url" select="'doc@FreeBSD.org'"/>
   <xsl:param name="callout.graphics.path" select="'./imagelib/callouts/'"/>
   <xsl:param name="citerefentry.link" select="1"/>
+  <xsl:param name="admon.style"/>
 
   <xsl:template name="user.footer.content">
     <p align="center"><small>This, and other documents, can be downloaded
@@ -38,4 +39,27 @@
     <xsl:text>&#38;amp;sektion=</xsl:text>
     <xsl:value-of select="manvolnum"/>
   </xsl:template>
+
+  <xsl:template name="nongraphical.admonition">
+    <div>
+      <xsl:call-template name="common.html.attributes">
+        <xsl:with-param name="inherit" select="1"/>
+      </xsl:call-template>
+      <xsl:if test="$admon.style">
+        <xsl:attribute name="style">
+          <xsl:value-of select="$admon.style"/>
+        </xsl:attribute>
+      </xsl:if>
+
+      <xsl:if test="$admon.textlabel != 0 or title or info/title">
+        <h3 class="admontitle">
+          <xsl:call-template name="anchor"/>
+          <xsl:apply-templates select="." mode="object.title.markup"/>
+	  <xsl:text>: </xsl:text>
+        </h3>
+      </xsl:if>
+
+      <xsl:apply-templates/>
+    </div>
+  </xsl:template>
 </xsl:stylesheet>