fixed spelling and working -- Alex van den Bogaerdt alex at ergens.op.het.net

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@385 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/doc/rrdcreate.pod b/doc/rrdcreate.pod
index 3b7fb68..4f80a6e 100644 (file)
--- a/doc/rrdcreate.pod
+++ b/doc/rrdcreate.pod
@@ -257,7 +257,7 @@ they are explicitly created, the creator should verify that all three
 I<seasonal period> arguments agree.
 
 I<alpha> is the adaption parameter of the intercept (or baseline)
 I<seasonal period> arguments agree.
 
 I<alpha> is the adaption parameter of the intercept (or baseline)

-coefficient in the Holt-Winters forecasting algorithm. See L<RRDtool> for a
+coefficient in the Holt-Winters forecasting algorithm. See L<rrdtool> for a

 description of this algorithm. I<alpha> must lie between 0 and 1. A value
 closer to 1 means that more recent observations carry greater weight in
 predicting the baseline component of the forecast. A value closer to 0 mean
 description of this algorithm. I<alpha> must lie between 0 and 1. A value
 closer to 1 means that more recent observations carry greater weight in
 predicting the baseline component of the forecast. A value closer to 0 mean

diff --git a/doc/rrdxport.pod b/doc/rrdxport.pod
index fcaaa0d..f5f11f4 100644 (file)
--- a/doc/rrdxport.pod
+++ b/doc/rrdxport.pod
@@ -63,7 +63,7 @@ See I<rrdgraph> documentation.
 At least one I<XPORT> statement should be present. The values
 referenced by I<vname> are printed. Optionally add a legend.
 
 At least one I<XPORT> statement should be present. The values
 referenced by I<vname> are printed. Optionally add a legend.
 

-=over
+=back

 
 =head1 Output format
 
 
 =head1 Output format
 

diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index 5efaa4e..ce39ce0 100644 (file)
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.c
@@ -2,7 +2,7 @@
  * RRDtool 1.2rc6  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd_graph_helper.c  commandline parser functions 
  * RRDtool 1.2rc6  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd_graph_helper.c  commandline parser functions 

- *                     this code was probably writtenn by Alex van den Bogaerdt
+ *                     this code initially written by Alex van den Bogaerdt

  ****************************************************************************/
 
 #include "rrd_graph.h"
  ****************************************************************************/
 
 #include "rrd_graph.h"


@@ -97,9 +97,9 @@ rrd_parse_color(char *string, graph_desc_t *gdp) {
     sscanf(string, "#%02x%02x%02x%n%02x%n%*s%n",
                                &r,&g,&b,&i1,&a,&i2,&i3);
 
     sscanf(string, "#%02x%02x%02x%n%02x%n%*s%n",
                                &r,&g,&b,&i1,&a,&i2,&i3);
 

-    if (i3) return 1; /* garbage after color */
-    if (!i2) a=0xFF;
-    if (!i1) return 1; /* no color after '#' */
+    if (i3) return 1;  /* garbage after color */
+    if (!i2) a=0xFF;   /* default no transparency */
+    if (!i1) return 1; /* no color after '#' */

     gdp->col = r<<24|g<<16|b<<8|a;
     return 0;
 }
     gdp->col = r<<24|g<<16|b<<8|a;
     return 0;
 }


@@ -163,7 +163,7 @@ rrd_parse_print(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t
     }
 
     if (rrd_parse_legend(line,eaten,gdp)) return 1;
     }
 
     if (rrd_parse_legend(line,eaten,gdp)) return 1;

-    /* for *PRINT the legend itself gets renderd later. We only
+    /* for *PRINT the legend itself gets rendered later. We only

        get the format at this juncture */
     strcpy(gdp->format,gdp->legend);
     gdp->legend[0]='\0';       
        get the format at this juncture */
     strcpy(gdp->format,gdp->legend);
     gdp->legend[0]='\0';       

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index dff19c3..fb0fafe 100644 (file)
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -116,12 +116,15 @@ void PrintUsage(char *cmd)
     char help_graph3[] =
           "\t\t[DEF:vname=rrd:ds-name:CF]\n"
           "\t\t[CDEF:vname=rpn-expression]\n"
     char help_graph3[] =
           "\t\t[DEF:vname=rrd:ds-name:CF]\n"
           "\t\t[CDEF:vname=rpn-expression]\n"

+          "\t\t[VDEF:vdefname=rpn-expression]\n"

           "\t\t[PRINT:vname:CF:format]\n"
           "\t\t[GPRINT:vname:CF:format]\n"
           "\t\t[PRINT:vname:CF:format]\n"
           "\t\t[GPRINT:vname:CF:format]\n"

+          "\t\t[PRINT:vdefname:format]\n"
+          "\t\t[GPRINT:vdefname:format]\n"

           "\t\t[HRULE:value#rrggbb[aa][:legend]]\n"
           "\t\t[VRULE:value#rrggbb[aa][:legend]]\n"
           "\t\t[HRULE:value#rrggbb[aa][:legend]]\n"
           "\t\t[VRULE:value#rrggbb[aa][:legend]]\n"

-          "\t\t[LINE{1|2|3}:vname[#rrggbb[aa][:legend]]]\n"
-          "\t\t[AREA:vname[#rrggbb[aa][:legend]]]\n"
+          "\t\t[LINE{1|2|3}:vname[#rrggbb[aa][:legend]][:STACK]]\n"
+          "\t\t[AREA:vname[#rrggbb[aa][:legend]][:STACK]]\n"

           "\t\t[STACK:vname[#rrggbb[aa][:legend]]]\n\n";
 
     char help_tune1[] =
           "\t\t[STACK:vname[#rrggbb[aa][:legend]]]\n\n";
 
     char help_tune1[] =