Imported upstream version 1.3rc9.

[pkg-rrdtool.git] / doc / rrdgraph.txt

diff --git a/doc/rrdgraph.txt b/doc/rrdgraph.txt
index d18c746ad38cf83cfe54e5920505bc775c725b35..641c1fd28ab166ea77b7c4586e2d42084bf6d94f 100644 (file)
--- a/doc/rrdgraph.txt
+++ b/doc/rrdgraph.txt
@@ -325,6 +325,30 @@ O\bOP\bPT\bTI\bIO\bON\bNS\bS
            bitmapped, that is, without any font smoothing. By default, no text
            is rendered bitmapped.
 
+           [-\b-P\bP|-\b--\b-p\bpa\ban\bng\bgo\bo-\b-m\bma\bar\brk\bku\bup\bp]
+
+           All text in rrdtool is rendered using Pango. With the
+           -\b--\b-p\bpa\ban\bng\bgo\bo-\b-m\bma\bar\brk\bku\bup\bp option, all text will be processed by pango markup.
+           This allows to embed some simple html like markup tags using
+
+            <span key="value">text</span>
+
+           Apart from the verbose syntax, there are also the following short
+           tags available.
+
+            b     Bold
+            big   Makes font relatively larger, equivalent to <span size="larger">
+            i     Italic
+            s     Strikethrough
+            sub   Subscript
+            sup   Superscript
+            small Makes font relatively smaller, equivalent to <span size="smaller">
+            tt    Monospace font
+            u     Underline
+
+           More details on <http://developer.gnome.org/doc/API/2.0/pango/Pan-
+           goMarkupFormat.html>.
+
            [-\b-G\bG|-\b--\b-g\bgr\bra\bap\bph\bh-\b-r\bre\ben\bnd\bde\ber\br-\b-m\bmo\bod\bde\be {n\bno\bor\brm\bma\bal\bl,m\bmo\bon\bno\bo}]
 
            There are 2 render modes:
@@ -398,28 +422,6 @@ O\bOP\bPT\bTI\bIO\bON\bNS\bS
            least one print statement to generate a report.  See rrdgraph_graph
            for the exact format.
 
-       Markup
-           All text in rrdtool is rendered using Pango markup. This means text
-           can contain embeded markup instructions.  Simple html markup using
-
-            <span key="value">text</span>
-
-           can be used. Apart from the verbose syntax, there are also the fol-
-           lowing short tags available.
-
-            b     Bold
-            big   Makes font relatively larger, equivalent to <span size="larger">
-            i     Italic
-            s     Strikethrough
-            sub   Subscript
-            sup   Superscript
-            small Makes font relatively smaller, equivalent to <span size="smaller">
-            tt    Monospace font
-            u     Underline
-
-           More details on http://developer.gnome.org/doc/API/2.0/pango/Pango-
-           MarkupFormat.html.
-
        g\bgr\bra\bap\bph\bhv\bv
 
        Calling rrdtool with the graphv option will return information in the
@@ -463,4 +465,4 @@ A\bAU\bUT\bTH\bHO\bOR\bR
 
 
 
-1.3rc6                            2008-04-21                       RRDGRAPH(1)
+1.3rc9                            2008-06-05                       RRDGRAPH(1)