fix spelling and syntax, especially in messages that are printed -- Mike Slifcak

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@263 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/THREADS b/THREADS
index 152a2c3..b048163 100644 (file)
--- a/THREADS
+++ b/THREADS
@@ -46,7 +46,7 @@ thread-safe.
   getopt uses global variables and behaves badly in a multithreaded
   application when called concurrently. Instead provide a *_r function
   taking all options as function parameters. You may provide argc and
   getopt uses global variables and behaves badly in a multithreaded
   application when called concurrently. Instead provide a *_r function
   taking all options as function parameters. You may provide argc and

-  **argv arguments for variable lenght argument lists. See
+  **argv arguments for variable length argument lists. See

   rrd_update_r as an example. 
 
 * Do not use the parsetime function!
   rrd_update_r as an example. 
 
 * Do not use the parsetime function!

diff --git a/doc/rrdthreads.pod b/doc/rrdthreads.pod
index 6d40c4e..00f5e02 100644 (file)
--- a/doc/rrdthreads.pod
+++ b/doc/rrdthreads.pod
@@ -128,7 +128,7 @@ Do not use the C<parsetime> function!
 
 It uses lots of global vars. You may use it in functions not designed
 to be thread-safe like functions wrapping the C<_r> version of some
 
 It uses lots of global vars. You may use it in functions not designed
 to be thread-safe like functions wrapping the C<_r> version of some

-operation (eg. C<rrd_create>, but not in C<rrd_create_r>)
+operation (e.g., C<rrd_create>, but not in C<rrd_create_r>)

 
 =back
 
 
 =back
 

diff --git a/doc/rrdtutorial.pod b/doc/rrdtutorial.pod
index f64a6b5..85589c2 100644 (file)
--- a/doc/rrdtutorial.pod
+++ b/doc/rrdtutorial.pod
@@ -42,7 +42,7 @@ will not grow in size and therefore requires no maintenance.
 RRDtool works with with Round Robin Databases (RRDs). It stores and retrieves
 data from them.
 
 RRDtool works with with Round Robin Databases (RRDs). It stores and retrieves
 data from them.
 

-=head2 What data can be put into an RDD ?
+=head2 What data can be put into an RRD ?

 
 You name it, it will probably fit. You should be able to measure some value
 at several points in time and provide this information to RRDtool. If you
 
 You name it, it will probably fit. You should be able to measure some value
 at several points in time and provide this information to RRDtool. If you


@@ -80,7 +80,7 @@ measure the data and be able to feed the numbers to RRDtool.
 
 First of all: read it again! You may have missed something.
 If you are unable to compile the sources and you have a fairly common
 
 First of all: read it again! You may have missed something.
 If you are unable to compile the sources and you have a fairly common

-OS, it will probably not be the fault of RRDtool. There may be precompiled
+OS, it will probably not be the fault of RRDtool. There may be pre-compiled

 versions around on the Internet. If they come from trusted sources, get
 one of those.
 If on the other hand the program works but does not give you the
 versions around on the Internet. If they come from trusted sources, get
 one of those.
 If on the other hand the program works but does not give you the


@@ -220,9 +220,9 @@ which starts at noon the day I started (7th of march, 1999) writing
 this document. It holds one data source (DS) named "speed" that gets
 built from a counter. This counter is read every five minutes (default)
 In the same database two round robin archives (RRAs) are kept, one
 this document. It holds one data source (DS) named "speed" that gets
 built from a counter. This counter is read every five minutes (default)
 In the same database two round robin archives (RRAs) are kept, one

-averages the data every time it is read (eg there's nothing to average)
+averages the data every time it is read (e.g., there's nothing to average)

 and keeps 24 samples (24 times 5 minutes is 2 hours). The other averages
 and keeps 24 samples (24 times 5 minutes is 2 hours). The other averages

-6 values (half hour) and contains 10 of such averages (eg 5 hours)
+6 values (half hour) and contains 10 of such averages (e.g., 5 hours)

 The remaining options will be discussed later on.
 
 RRDtool works with special time stamps coming from the UNIX world.
 The remaining options will be discussed later on.
 
 RRDtool works with special time stamps coming from the UNIX world.


@@ -533,7 +533,7 @@ worse, they have several default prefixes ...
 
 Right, lets continue to the start of our OID: we had 1.3.6.1.2.1
 From there, we are especially interested in the branch "interfaces"
 
 Right, lets continue to the start of our OID: we had 1.3.6.1.2.1
 From there, we are especially interested in the branch "interfaces"

-which has number 2 (eg 1.3.6.1.2.1.2 or 1.3.6.1.2.1.interfaces).
+which has number 2 (e.g., 1.3.6.1.2.1.2 or 1.3.6.1.2.1.interfaces).

 
 First, we have to get some SNMP program. First look if there is a
 pre-compiled package available for your OS. This is the preferred way.
 
 First, we have to get some SNMP program. First look if there is a
 pre-compiled package available for your OS. This is the preferred way.


@@ -1044,7 +1044,7 @@ Next time you are at exactly the right time. This means that the current
 interval is 297 seconds and also the counter increased with 297. Again
 RRDtool alters the value and stores 300 as it should be.
 
 interval is 297 seconds and also the counter increased with 297. Again
 RRDtool alters the value and stores 300 as it should be.
 

-      in the RDD                 in reality
+      in the RRD                 in reality

 
  time+000:   0 delta="U"   time+000:    0 delta="U"
  time+300: 300 delta=300   time+300:  300 delta=300
 
  time+000:   0 delta="U"   time+000:    0 delta="U"
  time+300: 300 delta=300   time+300:  300 delta=300

diff --git a/doc/rrdupdate.pod b/doc/rrdupdate.pod
index 50a656e..3704078 100644 (file)
--- a/doc/rrdupdate.pod
+++ b/doc/rrdupdate.pod
@@ -72,7 +72,7 @@ B<DERIVE> or B<ABSOLUTE>.
 The remaining elements of the argument are DS updates. The order of this list is
 the same as the order the data sources were defined in the RRA.
 If there is no data for a certain data-source, the letter 
 The remaining elements of the argument are DS updates. The order of this list is
 the same as the order the data sources were defined in the RRA.
 If there is no data for a certain data-source, the letter 

-B<U> (eg. N:0.1:U:1) can be defined.
+B<U> (e.g., N:0.1:U:1) can be defined.

 
 The format of the value acquired from the data source is dependent of the
 data source type chosen. Normally it will be numeric, but the data acquisition
 
 The format of the value acquired from the data source is dependent of the
 data source type chosen. Normally it will be numeric, but the data acquisition

diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c
index 8a292c7..5a47dc2 100644 (file)
--- a/src/rrd_cgi.c
+++ b/src/rrd_cgi.c
@@ -951,7 +951,7 @@ parse(
        }
 
 #ifdef DEBUG_PARSER
        }
 
 #ifdef DEBUG_PARSER

-       printf("parse(): handeling tag '%s'\n", tag);
+       printf("parse(): handling tag '%s'\n", tag);

 #endif
 
        /* Scan for arguments following the tag;
 #endif
 
        /* Scan for arguments following the tag;

diff --git a/src/rrd_resize.c b/src/rrd_resize.c
index 39941c1..ddbf9ec 100644 (file)
--- a/src/rrd_resize.c
+++ b/src/rrd_resize.c
@@ -104,7 +104,7 @@ rrd_resize(int argc, char **argv)
     fwrite(rrdnew.rra_ptr,sizeof(rra_ptr_t),rrdnew.stat_head->rra_cnt,outfile);
 
     /* Move the CDPs from the old to the new database.
     fwrite(rrdnew.rra_ptr,sizeof(rra_ptr_t),rrdnew.stat_head->rra_cnt,outfile);
 
     /* Move the CDPs from the old to the new database.

-    ** This can be made (much) faster but isn't worth the efford. Clarity
+    ** This can be made (much) faster but isn't worth the effort. Clarity

     ** is much more important.
     */
 
     ** is much more important.
     */
 

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index 842f33b..e759c1c 100644 (file)
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -20,7 +20,7 @@ void parse_patch1028_RRA_params(char **buf, rrd_t *rrd, int rra_index);
 void parse_patch1028_CDP_params(char **buf, rrd_t *rrd, int rra_index, int ds_index);
 void parse_FAILURES_history(char **buf, rrd_t *rrd, int rra_index, int ds_index);
 
 void parse_patch1028_CDP_params(char **buf, rrd_t *rrd, int rra_index, int ds_index);
 void parse_FAILURES_history(char **buf, rrd_t *rrd, int rra_index, int ds_index);
 

-/* convert all ocurances of <BlaBlaBla> to <blablabla> */
+/* convert all occurrences of <BlaBlaBla> to <blablabla> */

 
 void xml_lc(char* buf){
   int intag=0;
 
 void xml_lc(char* buf){
   int intag=0;


@@ -194,12 +194,12 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){
   while (eat_tag(&ptr2,"rra") == 1){
       rrd->stat_head->rra_cnt++;
 
   while (eat_tag(&ptr2,"rra") == 1){
       rrd->stat_head->rra_cnt++;
 

-      /* alocate and reset rra definition areas */
+      /* allocate and reset rra definition areas */

       if((rrd->rra_def = rrd_realloc(rrd->rra_def,rrd->stat_head->rra_cnt*sizeof(rra_def_t)))==NULL){
          rrd_set_error("allocating rra_def"); return -1; }      
       memset(&(rrd->rra_def[rrd->stat_head->rra_cnt-1]), 0, sizeof(rra_def_t));
 
       if((rrd->rra_def = rrd_realloc(rrd->rra_def,rrd->stat_head->rra_cnt*sizeof(rra_def_t)))==NULL){
          rrd_set_error("allocating rra_def"); return -1; }      
       memset(&(rrd->rra_def[rrd->stat_head->rra_cnt-1]), 0, sizeof(rra_def_t));
 

-      /* alocate and reset consolidation point areas */
+      /* allocate and reset consolidation point areas */

       if((rrd->cdp_prep = rrd_realloc(rrd->cdp_prep,
                                  rrd->stat_head->rra_cnt
                                  *rrd->stat_head->ds_cnt*sizeof(cdp_prep_t)))==NULL){
       if((rrd->cdp_prep = rrd_realloc(rrd->cdp_prep,
                                  rrd->stat_head->rra_cnt
                                  *rrd->stat_head->ds_cnt*sizeof(cdp_prep_t)))==NULL){

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index a462248..6892ac5 100644 (file)
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -70,7 +70,7 @@ void PrintUsage(char *cmd)
           "\t\t[ time:value[:value...] ..]\n\n";
     
        char help_updatev[] =
           "\t\t[ time:value[:value...] ..]\n\n";
     
        char help_updatev[] =

-          "* updatev - a verbose verion of update\n"
+          "* updatev - a verbose version of update\n"

           "\treturns information about values, RRAs, and datasources updated\n\n"
           "\trrdtool updatev filename\n"
           "\t\t--template|-t ds-name:ds-name:...\n"
           "\treturns information about values, RRAs, and datasources updated\n\n"
           "\trrdtool updatev filename\n"
           "\t\t--template|-t ds-name:ds-name:...\n"


@@ -132,7 +132,7 @@ void PrintUsage(char *cmd)
           "\t\t[--aberrant-reset ds-name]\n\n";
 
     char help_resize[] =
           "\t\t[--aberrant-reset ds-name]\n\n";
 
     char help_resize[] =

-          " * resize - alter the lenght of one of the RRAs in an RRD\n\n"
+          " * resize - alter the length of one of the RRAs in an RRD\n\n"

           "\trrdtool resize filename rranum GROW|SHRINK rows\n\n";
 
     char help_xport[] =
           "\trrdtool resize filename rranum GROW|SHRINK rows\n\n";
 
     char help_xport[] =


@@ -145,7 +145,7 @@ void PrintUsage(char *cmd)
            "\t\t[XPORT:vname:legend]\n\n";
 
     char help_quit[] =
            "\t\t[XPORT:vname:legend]\n\n";
 
     char help_quit[] =

-          " * quit - closeing a session in remote mode\n\n"
+          " * quit - closing a session in remote mode\n\n"

           "\trrdtool quit\n\n";
 
     char help_ls[] =
           "\trrdtool quit\n\n";
 
     char help_ls[] =


@@ -154,11 +154,11 @@ void PrintUsage(char *cmd)
 
     char help_cd[] =
           " * cd - changes the current directory\n\n"
 
     char help_cd[] =
           " * cd - changes the current directory\n\n"

-          "\trrdtool cd new direcotry\n\n";
+          "\trrdtool cd new directory\n\n";

 
     char help_mkdir[] =
 
     char help_mkdir[] =

-          " * mkdir - creates a new direcotry\n\n"
-          "\trrdtool mkdir newdirecotryname\n\n";
+          " * mkdir - creates a new directory\n\n"
+          "\trrdtool mkdir newdirectoryname\n\n";

 
     char help_lic[] =
           "RRDtool is distributed under the Terms of the GNU General\n"
 
     char help_lic[] =
           "RRDtool is distributed under the Terms of the GNU General\n"


@@ -410,7 +410,7 @@ int HandleInputLine(int argc, char **argv, FILE* out)
           }
 #if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID)
           if (getuid()==0 && ! ChangeRoot){
           }
 #if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID)
           if (getuid()==0 && ! ChangeRoot){

-             printf("ERROR: chdir security problem - rrdtool is runnig as "
+             printf("ERROR: chdir security problem - rrdtool is running as "

                     "root an no chroot!\n");
              return(0); 
           }
                     "root an no chroot!\n");
              return(0); 
           }


@@ -428,7 +428,7 @@ int HandleInputLine(int argc, char **argv, FILE* out)
           }
 #if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID)
           if (getuid()==0 && ! ChangeRoot){
           }
 #if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID)
           if (getuid()==0 && ! ChangeRoot){

-             printf("ERROR: mkdir security problem - rrdtool is runnig as "
+             printf("ERROR: mkdir security problem - rrdtool is running as "

                     "root an no chroot!\n");
              return(0); 
           }
                     "root an no chroot!\n");
              return(0); 
           }

diff --git a/src/rrd_update.c b/src/rrd_update.c
index 957cf77..117de6a 100644 (file)
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -5,6 +5,9 @@
  *****************************************************************************
  * $Id$
  * $Log$
  *****************************************************************************
  * $Id$
  * $Log$

+ * Revision 1.16  2004/05/25 20:52:16  oetiker
+ * fix spelling and syntax, especially in messages that are printed -- Mike Slifcak
+ *

  * Revision 1.15  2004/05/25 20:51:49  oetiker
  * Update displayed copyright messages to be consistent. -- Mike Slifcak
  *
  * Revision 1.15  2004/05/25 20:51:49  oetiker
  * Update displayed copyright messages to be consistent. -- Mike Slifcak
  *


@@ -647,7 +650,7 @@ _rrd_update(char *filename, char *template, int argc, char **argv,
                        }
                       pdp_new[i]= rrd_diff(updvals[i+1],rrd.pdp_prep[i].last_ds);
                       if(dst_idx == DST_COUNTER) {
                        }
                       pdp_new[i]= rrd_diff(updvals[i+1],rrd.pdp_prep[i].last_ds);
                       if(dst_idx == DST_COUNTER) {

-                         /* simple overflow catcher sugestet by andres kroonmaa */
+                         /* simple overflow catcher suggested by Andres Kroonmaa */

                          /* this will fail terribly for non 32 or 64 bit counters ... */
                          /* are there any others in SNMP land ? */
                          if (pdp_new[i] < (double)0.0 ) 
                          /* this will fail terribly for non 32 or 64 bit counters ... */
                          /* are there any others in SNMP land ? */
                          if (pdp_new[i] < (double)0.0 )