Text corrections

conf.d/01-system-paths.conf.in

@@ -9,7 +9,7 @@
 # *** DO NOT EDIT THIS FILE ***
 #
 # To make custom changes to the variables below, create a new configuration
-# file, with an extention of .conf, containing your desired modifications.
+# file, with an extension of .conf, containing your desired modifications.
 #
 
 # Full path to the folder events are recorded to.

docs/faq.rst

@@ -396,7 +396,7 @@ ZoneMinder provides a sample alarm script called `zmalarm.pl <https://github.com
 
 Trouble Shooting
 -------------------
-Here are some things that will help you track down whats wrong.
+Here are some things that will help you track down what's wrong.
 This is also how to obtain the info that we need to help you on the forums.
 
 What logs should I check for errors?

scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm

@@ -312,7 +312,7 @@ sub autoStop {
     my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">'.authentificationHeader($username, $password).'<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>' . $profileToken . '</ProfileToken><Velocity><PanTilt x="0" y="0" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
     $self->sendCmd($cmd, $msg, $content_type);
 
-    # Reported to not work, so superceded by the cmd above
+    # Reported to not work, so superseded by the cmd above
     $msg = '<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">'.authentificationHeader($username, $password).'<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Stop xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>' . $profileToken . '</ProfileToken><PanTilt>true</PanTilt><Zoom>false</Zoom></Stop></s:Body></s:Envelope>';
     $self->sendCmd($cmd, $msg, $content_type);
   }

scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm

@@ -19,7 +19,7 @@
 #
 # ==========================================================================
 #
-# This module contains an example overriden trigger connection class
+# This module contains an example overridden trigger connection class
 #
 package ZoneMinder::Trigger::Connection::Example;
 

utils/do_debian_package.sh

@@ -235,7 +235,7 @@ IFS=',' ;for DISTRO in `echo "$DISTROS"`; do
     rm -rf debian
   fi;
 
-  # Generate Changlog
+  # Generate Changelog
   if [ "$DISTRO" == "beowulf" ]; then
     cp -Rpd distros/beowulf debian
   else
@@ -292,14 +292,14 @@ EOF
   # Leave the .orig so that we don't pollute it when building deps
   cd ..
   if [ $TYPE == "binary" ]; then
-	  # Auto-install all ZoneMinder's depedencies using the Debian control file
+	  # Auto-install all ZoneMinder's dependencies using the Debian control file
 	  sudo apt-get install devscripts equivs
 	  sudo mk-build-deps -ir $DIRECTORY.orig/debian/control
 	  echo "Status: $?"
 	  DEBUILD=debuild
   else
 	  if [ $TYPE == "local" ]; then
-		  # Auto-install all ZoneMinder's depedencies using the Debian control file
+		  # Auto-install all ZoneMinder's dependencies using the Debian control file
 		  sudo apt-get install devscripts equivs
 		  sudo mk-build-deps -ir $DIRECTORY.orig/debian/control
 		  echo "Status: $?"
@@ -381,7 +381,7 @@ EOF
 done; # foreach distro
 
 if [ "$INTERACTIVE" != "no" ]; then
-  read -p "Do you want to keep the checked out version of Zoneminder (incase you want to modify it later) [y/N]"
+  read -p "Do you want to keep the checked out version of Zoneminder (in case you want to modify it later) [y/N]"
   [[ $REPLY == [yY] ]] && { mv "$DIRECTORY.orig" zoneminder_release; echo "The checked out copy is preserved in zoneminder_release"; } || { rm -fr "$DIRECTORY.orig"; echo "The checked out copy has been deleted"; }
   echo "Done!"
 else 

utils/packpack/startpackpack.sh

@@ -101,7 +101,7 @@ commonprep () {
         echo "Retrieving Crud ${CRUDVER} submodule..."
         curl -L https://github.com/FriendsOfCake/crud/archive/v${CRUDVER}.tar.gz > build/crud-${CRUDVER}.tar.gz
         if [ $? -ne 0 ]; then
-            echo "ERROR: Crud tarball retreival failed..."
+            echo "ERROR: Crud tarball retrieval failed..."
             exit 1
         fi
     fi
@@ -113,7 +113,7 @@ commonprep () {
         echo "Retrieving CakePHP-Enum-Behavior ${CEBVER} submodule..."
         curl -L https://github.com/ZoneMinder/CakePHP-Enum-Behavior/archive/${CEBVER}.tar.gz > build/cakephp-enum-behavior-${CEBVER}.tar.gz
         if [ $? -ne 0 ]; then
-            echo "ERROR: CakePHP-Enum-Behavior tarball retreival failed..."
+            echo "ERROR: CakePHP-Enum-Behavior tarball retrieval failed..."
             exit 1
         fi
     fi
@@ -125,7 +125,7 @@ commonprep () {
         echo "Retrieving RTSP ${RTSPVER} submodule..."
         curl -L https://github.com/ZoneMinder/RtspServer/archive/${RTSPVER}.tar.gz > build/RtspServer-${RTSPVER}.tar.gz
         if [ $? -ne 0 ]; then
-            echo "ERROR: RtspServer tarball retreival failed..."
+            echo "ERROR: RtspServer tarball retrieval failed..."
             exit 1
         fi
     fi
@@ -159,7 +159,7 @@ movecrud () {
     fi
 }
 
-# previsouly part of installzm.sh
+# previously part of installzm.sh
 # install the deb and test zoneminder
 install_deb () {
 

utils/zmeditconfigdata.sh

@@ -14,7 +14,7 @@ Replace the default value, DEFAULT, of the specified ZoneMinder
 variable, VARIABLE, located in ConfigData.pm.in.
 
 Default folder for ConfigData is ./scripts/ZoneMinder/lib/ZoneMinder
-Specify CONFIGDATA DIRETORY to override.
+Specify CONFIGDATA DIRECTORY to override.
 
 Run this script from your build folder, before running configure or cmake.
 

web/ajax/console.php

@@ -4,7 +4,7 @@ if ( canEdit('Monitors') ) {
   case 'sort' :
   {
     $monitor_ids = $_POST['monitor_ids'];
-    # Two concurrent sorts could generate odd sortings... so lock the table.
+    # Two concurrent sorts could generate odd sorting... so lock the table.
     global $dbConn;
     $dbConn->beginTransaction();
     $dbConn->exec('LOCK TABLES Monitors WRITE');

web/ajax/status.php

@@ -123,7 +123,7 @@ $statusData = array(
         global $dateTimeFormatter;
         return $dateTimeFormatter->format(strtotime($row['StartDateTime']));
       }),
-      # Left for backwards compatability. Remove in 1.37
+      # Left for backwards compatibility. Remove in 1.37
       'EndDateTime' => true,
       'EndDateTimeFormatted' => array('postFunction'=>function($row){
         global $dateTimeFormatter;
@@ -157,7 +157,7 @@ $statusData = array(
         global $dateTimeFormatter;
         return $dateTimeFormatter->format(strtotime($row['StartDateTime']));
       }),
-      # Left for backwards compatability. Remove in 1.37
+      # Left for backwards compatibility. Remove in 1.37
       'EndDateTime' => true,
       'EndDateTimeFormatted' => array('postFunction'=>function($row){
         global $dateTimeFormatter;
@@ -478,7 +478,7 @@ function getNearEvents() {
   }
   $sql .= ' AND E.Id<'.$event['Id'] . ' ORDER BY '.$sortColumn.' '.($sortOrder=='ASC'?'DESC':'ASC');
   if ( $sortColumn != 'E.Id' ) {
-    # When sorting by starttime, if we have two events with the same starttime (diffreent monitors) then we should sort secondly by Id
+    # When sorting by starttime, if we have two events with the same starttime (different monitors) then we should sort secondly by Id
     $sql .= ', E.Id DESC';
   }
   $sql .= ' LIMIT 1';
@@ -496,7 +496,7 @@ function getNearEvents() {
   }
   $sql .=' AND E.Id>'.$event['Id'] . ' ORDER BY '.$sortColumn.' '.($sortOrder=='ASC'?'ASC':'DESC');
   if ( $sortColumn != 'E.Id' ) {
-    # When sorting by starttime, if we have two events with the same starttime (diffreent monitors) then we should sort secondly by Id
+    # When sorting by starttime, if we have two events with the same starttime (different monitors) then we should sort secondly by Id
     $sql .= ', E.Id ASC';
   }
   $sql .= ' LIMIT 1';

web/ajax/stream.php

@@ -166,7 +166,7 @@ case MSG_DATA_WATCH :
         $data['auth'] = $auth_hash;
         ZM\Debug('including new auth hash '.$data['auth'].'because doesnt match request auth hash '.$_REQUEST['auth']);
       } else {
-        ZM\Debug('Not including new auth hash becase it hasn\'t changed '.$auth_hash);
+        ZM\Debug('Not including new auth hash because it hasn\'t changed '.$auth_hash);
       }
     }
     $data['auth_relay'] = get_auth_relay();

web/ajax/watch.php

@@ -1,7 +1,7 @@
 <?php
 //
 // This is simplified version of the logic from ajax/events.php
-// For efficency, sorting and and pagination functionality have been exlcuded
+// For efficiency, sorting and and pagination functionality have been excluded
 //
 
 $message = '';

web/api/README.md

@@ -7,7 +7,7 @@ e.g. /api.
 app/Config/database.php.default must be configured and copied to
 app/Config/database.php
 
-In adition, Security.salt and Security.cipherSeed in app/Config/core.php should
+In addition, Security.salt and Security.cipherSeed in app/Config/core.php should
 be changed.
 
 The API can run on a dedicated / separate instance, so long as it can access

zm.conf.in

@@ -7,7 +7,7 @@
 # *** DO NOT EDIT THIS FILE ***
 #
 # To make custom changes to the variables below, create a new configuration
-# file, with an extention of .conf, under the @ZM_CONFIG_SUBDIR@
+# file, with an extension of .conf, under the @ZM_CONFIG_SUBDIR@
 # folder, containing your desired modifications.
 #
 

zmlinkcontent.sh.in

@@ -11,7 +11,7 @@ ZM_LOGDIR="@ZM_LOGDIR@"
 # Set the zoneminder temp dir default to be the one supplied to cmake
 ZM_TMPDIR="@ZM_TMPDIR@"
 
-echo "*** This bash script creates the nessecary symlinks for the zoneminder content"
+echo "*** This bash script creates the necessary symlinks for the zoneminder content"
 echo "*** It can use an existing content folder or create a new one"
 echo "*** For usage: use -h"
 echo "*** The default content directory is: $ZM_PATH_CONTENT"