Imported Upstream version 1.4.7

[pkg-rrdtool.git] / doc / rrdgraph_graph.html

diff --git a/doc/rrdgraph_graph.html b/doc/rrdgraph_graph.html
index b0d7bef1f752772de00536c07ae7d1b605efc7c5..ac595c0bfcb7b44221c76cc835df865bba289664 100644 (file)
--- a/doc/rrdgraph_graph.html
+++ b/doc/rrdgraph_graph.html
@@ -142,7 +142,7 @@ will all use the same magnitude unit except for zero values.</p>
 </dd>
 </dl>
 <p>If you PRINT a VDEF value, you can also print the time associated with it by appending the string
-<strong>:strftime</strong> to the format. Note that rrdtool uses the strftime function of your OSs C library. This means that
+<strong>:strftime</strong> to the format. Note that RRDtool uses the strftime function of your OSs C library. This means that
 the conversion specifier may vary. Check the manual page if you are uncertain. The following is a list of
 conversion specifiers usually supported across the board.</p>
 <dl>
@@ -217,7 +217,7 @@ such cases %p will return an empty string.</p>
 <dt><strong><strong>%S</strong></strong></dt>
 
 <dd>
-<p>The seconds since the epoch (1.1.1970) (libc dependant non standard!)</p>
+<p>The seconds since the epoch (1.1.1970) (libc dependent non standard!)</p>
 </dd>
 <dt><strong><a name="_u" class="item"><strong>%U</strong></a></strong></dt>
 
@@ -402,7 +402,7 @@ specified.</p>
 right aligned, and <strong>\c</strong> for centered. In the next section there is an
 example showing how to use centered formatting.</p>
 <p><strong>\n</strong> is a valid alias for <strong>\l</strong> since incomplete parsing in earlier
-versions of rrdtool lead to this behavior and a number of people has been using it.</p>
+versions of RRDtool lead to this behavior and a number of people has been using it.</p>
 <p>Normally there are two space characters inserted between every two items
 printed into the graph. The space following a string can be suppressed by
 putting a <strong>\g</strong> at the end of the string. The <strong>\g</strong> also ignores any space
@@ -412,8 +412,18 @@ in connection with <strong>%s</strong> to suppress empty unit strings.</p>
  GPRINT:a:MAX:%lf%s\g</pre>
 <p>A special case is COMMENT:<strong>\s</strong> which inserts some additional vertical space
 before placing the next row of legends.</p>
-<p>If you are using the proportional font in your graph, you can use tab
-characters or the sequence <strong>\t</strong> to line-up legend elements. Note that
+<p>If you want to have left and right aligned legends on the same line use COMMENT:<strong>\u</strong>
+to go one line back like this:</p>
+<pre>
+ COMMENT:left\l
+ COMMENT:\u
+ COMMENT:right\r</pre>
+<p>There is also a 'nop' control for situations where you want a string to
+actually end in a backslash character sequence <strong>\.</strong></p>
+<pre>
+ COMMENT:OS\2\.</pre>
+<p>When using a proportional font in your graph, the tab
+characters or the sequence <strong>\t</strong> will line-up legend elements. Note that
 the tabs inserted are relative to the start of the current legend
 element!</p>
 <p>Since RRDtool 1.3 is using Pango for rending text, you can use Pango markup.
@@ -496,7 +506,7 @@ Pango uses the xml <strong>span</strong> tags for inline formatting instructions
 <dt><strong><a name="strikethrough_color" class="item"><strong>strikethrough_color</strong></a></strong></dt>
 
 <dd>
-<p>The color of strikethrough lines; an RGB color specification such as '#00FF00' or a color name such as 'red'</p>
+<p>The color of crossed out lines; an RGB color specification such as '#00FF00' or a color name such as 'red'</p>
 </dd>
 <dt><strong><a name="fallback" class="item"><strong>fallback</strong></a></strong></dt>
 
@@ -544,7 +554,7 @@ Pango uses the xml <strong>span</strong> tags for inline formatting instructions
 <dt><strong><a name="s" class="item"><strong>s</strong></a></strong></dt>
 
 <dd>
-<p>Strikethrough</p>
+<p>Strike through</p>
 </dd>
 <dt><strong><a name="sub" class="item"><strong>sub</strong></a></strong></dt>