From: Florian Forster <octo@leeloo.home.verplant.org>
Date: Sun, 29 Jun 2008 21:38:36 +0000 (+0200)
Subject: Merge branch 'master' into ff/rrdd
X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=commitdiff_plain;h=9fd92a932867262d4f3eb239f05473252f1e98b2

Merge branch 'master' into ff/rrdd
---

9fd92a932867262d4f3eb239f05473252f1e98b2
diff --cc doc/rrdgraph.pod
index 262410e,092e37f..99b2e6b
--- a/doc/rrdgraph.pod
+++ b/doc/rrdgraph.pod
@@@ -262,20 -262,11 +262,22 @@@ Note that for linear graphs, SI notatio
  
  [B<-z>|B<--lazy>]
  
- Only generate the graph if the current graph is out of date or not
- existent.
+ Only generate the graph if the current graph is out of date or not existent.
+ Note, that only the image size will be returned, if you run with lazy even
+ when using graphv.
+ 
  
 +[B<--daemon> I<address>]
 +
 +Address of the L<rrdcached(1)> daemon. If specified, a C<flush> command is sent
 +to the server before reading the RRD files. This allows the graph to contain
 +fresh data even if the daemon is configured to cache values for a long time. To
 +specify a UNIX domain socket use the prefix C<unix:>, see example below. Other
 +addresses are interpreted as normal network addresses, i.E<nbsp>e. IPv4 or IPv6
 +addresses in most cases.
 +
 + rrdtool graph [...] --daemon unix:/var/run/rrdcached.sock [...]
 +
  [B<-f>|B<--imginfo> I<printfstr>]
  
  After the image has been created, the graph function uses printf