Merge branch 'upstream'

[pkg-rrdtool.git] / doc / rrd-beginners.html

diff --git a/doc/rrd-beginners.html b/doc/rrd-beginners.html
index 6b097d307296eb6dc96b864b8ed2bc8e3063bd17..ed86bc7f0652f4f0aea0dbd407c36cc4b8d916c9 100644 (file)
--- a/doc/rrd-beginners.html
+++ b/doc/rrd-beginners.html
@@ -147,7 +147,7 @@ saved in the database. There can be as many DSs in a database as needed. After
 every step interval, a new value of DS is supplied to update the database.
 This value is also called Primary Data Point <strong>(PDP)</strong>. In our example
 mentioned above, a new PDP is generated every 300 seconds.</p>
-<p>Note, that if you do NOT supply new datapoints exactly every 300 seconds,
+<p>Note, that if you do NOT supply new data points exactly every 300 seconds,
 this is not a problem, RRDtool will interpolate the data accordingly.</p>
 <p><strong>DST</strong> (Data Source Type) defines the type of the DS. It can be
 COUNTER, DERIVE, ABSOLUTE, GAUGE. A DS declared as COUNTER will save
@@ -156,7 +156,7 @@ the value is always increasing (the difference between the current and
 the previous value is greater than 0). Traffic counters on a router
 are an ideal candidate for using COUNTER as DST. DERIVE is the same as
 COUNTER, but it allows negative values as well. If you want to see the
-rate of <em>change</em> in free diskspace on your server, then you might
+rate of <em>change</em> in free disk space on your server, then you might
 want to use the DERIVE data type. ABSOLUTE also saves the rate of
 change, but it assumes that the previous value is set to 0. The
 difference between the current and the previous value is always equal
@@ -322,26 +322,26 @@ generation is done using Perl scripts. These scripts are shown below:</p>
  # calculate the average of the array
  my $tot_mem_ave = $tot_mem_sum/($count);
  # create the graph
- RRDs::graph (&quot;/images/mem_$count.png&quot;,   \
-             &quot;--title= Memory Usage&quot;,    \
-             &quot;--vertical-label=Memory Consumption (MB)&quot;, \
-             &quot;--start=$start_time&quot;,      \
-             &quot;--end=$end_time&quot;,          \
-             &quot;--color=BACK#CCCCCC&quot;,      \
-             &quot;--color=CANVAS#CCFFFF&quot;,    \
-             &quot;--color=SHADEB#9999CC&quot;,    \
-             &quot;--height=125&quot;,             \
-             &quot;--upper-limit=656&quot;,        \
-             &quot;--lower-limit=0&quot;,          \
-             &quot;--rigid&quot;,                  \
-             &quot;--base=1024&quot;,              \
-             &quot;DEF:tot_mem=target.rrd:mem:AVERAGE&quot;, \
-             &quot;CDEF:tot_mem_cor=tot_mem,0,671744,LIMIT,UN,0,tot_mem,IF,1024,/&quot;,\
-             &quot;CDEF:machine_mem=tot_mem,656,+,tot_mem,-&quot;,\
-             &quot;COMMENT:Memory Consumption between $start_time&quot;,\
-             &quot;COMMENT:    and $end_time                     &quot;,\
-             &quot;HRULE:656#000000:Maximum Available Memory - 656 MB&quot;,\
-             &quot;AREA:machine_mem#CCFFFF:Memory Unused&quot;,   \
+ RRDs::graph (&quot;/images/mem_$count.png&quot;,   
+             &quot;--title= Memory Usage&quot;,    
+             &quot;--vertical-label=Memory Consumption (MB)&quot;, 
+             &quot;--start=$start_time&quot;,      
+             &quot;--end=$end_time&quot;,          
+             &quot;--color=BACK#CCCCCC&quot;,      
+             &quot;--color=CANVAS#CCFFFF&quot;,    
+             &quot;--color=SHADEB#9999CC&quot;,    
+             &quot;--height=125&quot;,             
+             &quot;--upper-limit=656&quot;,        
+             &quot;--lower-limit=0&quot;,          
+             &quot;--rigid&quot;,                  
+             &quot;--base=1024&quot;,              
+             &quot;DEF:tot_mem=target.rrd:mem:AVERAGE&quot;, 
+             &quot;CDEF:tot_mem_cor=tot_mem,0,671744,LIMIT,UN,0,tot_mem,IF,1024,/&quot;,
+             &quot;CDEF:machine_mem=tot_mem,656,+,tot_mem,-&quot;,
+             &quot;COMMENT:Memory Consumption between $start_time&quot;,
+             &quot;COMMENT:    and $end_time                     &quot;,
+             &quot;HRULE:656#000000:Maximum Available Memory - 656 MB&quot;,
+             &quot;AREA:machine_mem#CCFFFF:Memory Unused&quot;,   
              &quot;AREA:tot_mem_cor#6699CC:Total memory consumed in MB&quot;);
  my $err=RRDs::error;
  if ($err) {print &quot;problem generating the graph: $err\n&quot;;}