Merge pull request #477 from jsoref/spelling

Spelling

README.md

@@ -26,8 +26,8 @@ the command is targeted at one dataset and impacts it and all its children,
 allowing to get a consistent point-in-time set of snapshots across multiple
 datasets.
 
-Complilation Inztructionz
--------------------------
+Compilation Inztructionz
+------------------------
 
 If your distribution does not provide a packaged version of znapzend, or if
 you want to get a custom-made copy of znapzend, you will need a compiler and

bin/znapzend

@@ -186,7 +186,7 @@ do all changes to the filesystem except destroying old snapshots
 =item B<--logto>={B<syslog::>I<facility>|I<filepath>}
 
 send logs out to either syslog or a logfile. Default is to send logs to
-B<syslog::daemon> when runing daemonized. When running in debug mode, the
+B<syslog::daemon> when running daemonized. When running in debug mode, the
 logs will go to STDERR by default.
 
 Examples:
@@ -357,7 +357,7 @@ them individually.
 =item *
 
 Sometimes a snapshot can not be destroyed because of some oracle zfs bug.
-Only a reeboot seems to be able to fix this. So we just destroy the ones we
+Only a reboot seems to be able to fix this. So we just destroy the ones we
 can destroy. Logging an error about the problem
 
 =back

bin/znapzendzetup

@@ -682,7 +682,7 @@ Specify the path to your copy of the mbuffer utility.
 
 =item B<--mbuffer>=I</usr/bin/mbuffer:31337>
 
-Specifiy the path to your copy of the mbuffer utility and the port used
+Specify the path to your copy of the mbuffer utility and the port used
 on the destination. Caution: znapzend will send the data directly
 from source mbuffer to destination mbuffer, thus data stream is B<not>
 encrypted.

configure

@@ -2992,8 +2992,8 @@ fi
 done
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnu make availablility" >&5
-$as_echo_n "checking for gnu make availablility... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnu make availability" >&5
+$as_echo_n "checking for gnu make availability... " >&6; }
 if  ( $GMAKE --version 2> /dev/null | $GREP GNU  > /dev/null 2>&1 );  then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMAKE is GNU make" >&5
 $as_echo "$GMAKE is GNU make" >&6; }

configure.ac

@@ -108,7 +108,7 @@ AC_PROG_GREP
 AC_ARG_VAR(GMAKE,   [Path to local GNU Make binary])
 AC_PATH_PROGS(GMAKE, [gnumake gmake make])
 
-AC_MSG_CHECKING([for gnu make availablility])
+AC_MSG_CHECKING([for gnu make availability])
 if  ( $GMAKE --version 2> /dev/null | $GREP GNU  > /dev/null 2>&1 );  then
     AC_MSG_RESULT([$GMAKE is GNU make])
 else

doc/znapzend.pod

@@ -67,7 +67,7 @@ do all changes to the filesystem except destroying old snapshots
 =item B<--logto>={B<syslog::>I<facility>|I<filepath>}
 
 send logs out to either syslog or a logfile. Default is to send logs to
-B<syslog::daemon> when runing daemonized. When running in debug mode, the
+B<syslog::daemon> when running daemonized. When running in debug mode, the
 logs will go to STDERR by default.
 
 Examples:
@@ -238,7 +238,7 @@ them individually.
 =item *
 
 Sometimes a snapshot can not be destroyed because of some oracle zfs bug.
-Only a reeboot seems to be able to fix this. So we just destroy the ones we
+Only a reboot seems to be able to fix this. So we just destroy the ones we
 can destroy. Logging an error about the problem
 
 =back

doc/znapzendzetup.pod

@@ -183,7 +183,7 @@ Specify the path to your copy of the mbuffer utility.
 
 =item B<--mbuffer>=I</usr/bin/mbuffer:31337>
 
-Specifiy the path to your copy of the mbuffer utility and the port used
+Specify the path to your copy of the mbuffer utility and the port used
 on the destination. Caution: znapzend will send the data directly
 from source mbuffer to destination mbuffer, thus data stream is B<not>
 encrypted.

init/README.md

@@ -29,7 +29,7 @@ for an example plist.
 ## Solaris/Illumos
 
 For solaris/illumos OSes you can tell configure to install a znapzend
-service manifest into a partcular location (no default imposed) by
+service manifest into a particular location (no default imposed) by
 calling configure with the option like
 ```--enable-svcinstall=/var/svc/manifest/site```.
 You can also define the service name (defaults to ```oep/znapzend```)

init/znapzend.service.in

@@ -9,7 +9,7 @@ EnvironmentFile=-/etc/default/znapzend
 ExecStart=@BINDIR@/znapzend $ZNAPZENDOPTIONS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
-# might be neccessary on low power systems
+# might be necessary on low power systems
 # Nice=19
 # IOSchedulingClass=2
 # IOSchedulingPriority=7

lib/ZnapZend.pm

@@ -606,7 +606,7 @@ my $createSnapshot = sub {
 
             # for each dataset: if the property "enabled" is set to "off", set the
             # newly created snapshot for removal
-            my @dataSetsExplicitelyDisabled = ();
+            my @dataSetsExplicitlyDisabled = ();
             for my $dataSet (@dataSetList){
 
                 # get the value for org.znapzend property
@@ -619,15 +619,15 @@ my $createSnapshot = sub {
                 $prop = <$prop> || "on";
                 chomp($prop);
                 if ( $prop eq 'off' ) {
-                    push(@dataSetsExplicitelyDisabled, $dataSet . '@' . $snapshotSuffix);
+                    push(@dataSetsExplicitlyDisabled, $dataSet . '@' . $snapshotSuffix);
                 }
             }
 
             # remove the snapshots previously marked
             # removal here is non-recursive to allow for fine-grained control
-            if ( @dataSetsExplicitelyDisabled ){
-               $self->zLog->info("Requesting removal of marked datasets: ". join( ", ", @dataSetsExplicitelyDisabled));
-               $self->zZfs->destroySnapshots(@dataSetsExplicitelyDisabled, 0);
+            if ( @dataSetsExplicitlyDisabled ){
+               $self->zLog->info("Requesting removal of marked datasets: ". join( ", ", @dataSetsExplicitlyDisabled));
+               $self->zZfs->destroySnapshots(@dataSetsExplicitlyDisabled, 0);
            }
         }
     }

lib/ZnapZend/Time.pm

@@ -159,7 +159,7 @@ sub getSnapshotsToDestroy {
     my %timeslots;
     my @toDestroy;
 
-    #initialise with maximum time to keep backups since we run from old to new backups
+    #initialize with maximum time to keep backups since we run from old to new backups
     my $maxAge = (sort { $a<=>$b } keys %$timePlan)[-1];
 
     for my $snapshot (@$snapshots){
@@ -239,7 +239,7 @@ sub checkTimeFormat {
     my $resultingTime = $self->$getSnapshotTimestamp("dummydataset\@$formattedTime", $timeFormat)
         or die "ERROR: timestamp format not valid. check your syntax\n";
 
-    return $timeToCheck == $resultingTime; #times schould be equal
+    return $timeToCheck == $resultingTime; #times should be equal
 }
 
 sub getSnapshotFilter {

lib/ZnapZend/ZFS.pm

@@ -541,7 +541,7 @@ sub getDataSetProperties {
                 }
             }
         } else {
-            # Assume a string, per usual invokation
+            # Assume a string, per usual invocation
             print STDERR "=== getDataSetProperties(): Is string...\n" if $self->debug;
             if ($self->lowmemRecurse && $recurse) {
                 my $listds = $self->listDataSets(undef, $dataSet, $recurse);
@@ -1080,7 +1080,7 @@ returns whether scrub is active on zpool or not
 
 =head2 usedBySnapshots
 
-returns the amount of storage space used by snapshots of a sepcific dataset
+returns the amount of storage space used by snapshots of a specific dataset
 
 =head1 COPYRIGHT
 

man/znapzend.1

@@ -199,7 +199,7 @@ do all changes to the filesystem except destroying old snapshots
 .IP "\fB\-\-logto\fR={\fBsyslog::\fR\fIfacility\fR|\fIfilepath\fR}" 4
 .IX Item "--logto={syslog::facility|filepath}"
 send logs out to either syslog or a logfile. Default is to send logs to
-\&\fBsyslog::daemon\fR when runing daemonized. When running in debug mode, the
+\&\fBsyslog::daemon\fR when running daemonized. When running in debug mode, the
 logs will go to \s-1STDERR\s0 by default.
 .Sp
 Examples:
@@ -371,7 +371,7 @@ The multi snapshot destroy syntax is not available. So stick to destroying
 them individually.
 .IP "\(bu" 4
 Sometimes a snapshot can not be destroyed because of some oracle zfs bug.
-Only a reeboot seems to be able to fix this. So we just destroy the ones we
+Only a reboot seems to be able to fix this. So we just destroy the ones we
 can destroy. Logging an error about the problem
 .RE
 .RS 4

man/znapzendzetup.1

@@ -322,7 +322,7 @@ separator.
 Specify the path to your copy of the mbuffer utility.
 .IP "\fB\-\-mbuffer\fR=\fI/usr/bin/mbuffer:31337\fR" 4
 .IX Item "--mbuffer=/usr/bin/mbuffer:31337"
-Specifiy the path to your copy of the mbuffer utility and the port used
+Specify the path to your copy of the mbuffer utility and the port used
 on the destination. Caution: znapzend will send the data directly
 from source mbuffer to destination mbuffer, thus data stream is \fBnot\fR
 encrypted.

packaging/checkinstall/description-pak

@@ -1,4 +1,4 @@
-ZnapZend is a ZFS centric backup tool. It relies on snapshot, send and receive todo its work. It has the built-in ability to to manage both local snapshots as well as remote copies by thining them out as time progresses.
+ZnapZend is a ZFS centric backup tool. It relies on snapshot, send and receive todo its work. It has the built-in ability to to manage both local snapshots as well as remote copies by thinning them out as time progresses.
 
 The ZnapZend configuration is stored as properties in the ZFS filesystem itself.
 

t/zfs

@@ -129,7 +129,7 @@ sub find_attr_source {
 
         my $parentSource = find_attr_source($parentSourceName);
         if (!defined($parentSource) || $parentSource eq '-' || $parentSource eq 'default') {
-            return 'default'; #...or shoul we return $parentSource here?
+            return 'default'; #...or should we return $parentSource here?
         }
 
         if ($parentSource eq 'local' || $parentSource eq 'received') {
@@ -344,7 +344,7 @@ for ($command){
                 } else {
                     # Non-recursive, print the requested dataset of any type
                     # unless constrained by non-snapshots explicitly
-#print STDERR "=== zfs list : nonrecursive\n";
+#print STDERR "=== zfs list : non-recursive\n";
                     if ( $srcds =~ /@/ && $listsnaps < 0 ) {
                         print STDERR "cannot open '$srcds': snapshot delimiter '\@' is not expected here\n";
                         exit 1;