Merge branch 'master' of github.com:ZoneMinder/zoneminder

cmake/Modules/CheckPlatform.cmake

@@ -15,7 +15,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
 endif()
 if(NOT HOST_OS)
   message(FATAL_ERROR
-    "ZoneMinder was unable to deterimine the host OS. Please report this.
+    "ZoneMinder was unable to determine the host OS. Please report this.
     Value of CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
 endif()
 

cmake/Modules/FindGSOAP.cmake

@@ -78,15 +78,15 @@ find_program(GSOAP_SOAPCPP2
 )
 # -----------------------------------------------------
 # GSOAP version
-# try to determine the flagfor the 2.7.6 compatiblity, break with 2.7.13 and re-break with 2.7.16
+# try to determine the flag for the 2.7.6 compatibility, break with 2.7.13 and re-break with 2.7.16
 # ----------------------------------------------------
 if(GSOAP_SOAPCPP2)
   execute_process(COMMAND ${GSOAP_SOAPCPP2}  "-V"   OUTPUT_VARIABLE GSOAP_STRING_VERSION ERROR_VARIABLE GSOAP_STRING_VERSION )
   string(REGEX MATCH "[0-9]*\\.[0-9]*\\.[0-9]*" GSOAP_VERSION ${GSOAP_STRING_VERSION})
 endif()
 # -----------------------------------------------------
 # GSOAP_276_COMPAT_FLAGS and GSOAPVERSION
-# try to determine the flagfor the 2.7.6 compatiblity, break with 2.7.13 and re-break with 2.7.16
+# try to determine the flag for the 2.7.6 compatibility, break with 2.7.13 and re-break with 2.7.16
 # ----------------------------------------------------
 if( "${GSOAP_VERSION}"  VERSION_LESS "2.7.6")
 	set(GSOAP_276_COMPAT_FLAGS "")

cmakecacheimport.sh

@@ -6,7 +6,7 @@ echo "*** The file can be used with cmake like so: cmake -C zm_conf.cmake [extra
 echo "*** Usage: ./cmakecacheimport.sh [PATH TO ZM.CONF]"
 echo ""
 
-# Check for too many prameters
+# Check for too many parameters
 if [[ "$#" -gt "0" && "$#" -ne "1" ]]; then
        echo "Error: Too many parameters!"
        exit 50

distros/opensuse/README.OpenSuse

@@ -2,7 +2,7 @@ OpenSuse Notes
 ===============
 
 1. OpenSuse, along with other distros, now use systemd for task control.  
-   One of the capabilties of systemd is to use private space for /tmp to reduce
+   One of the capabilities of systemd is to use private space for /tmp to reduce
    the possibility of cross talk between applications.  The default settings 
    for zoneminder use /tmp for a number of files.  When you start/stop 
    zoneminder from a web page /tmp will be in private space but when the 

distros/redhat/readme/README

@@ -13,13 +13,13 @@ What's New
    other web servers. Here is a breakdown of the available packages:
 
      zoneminder - Meta-package installs zoneminder-common and zoneminder-httpd
-                  This exists soley for backwards compatibility.
+                  This exists solely for backwards compatibility.
      zoneminder-common - Common files that do not differ based on the web server
      zoneminder-httpd - Files needed for compatibility with the Apache web server
      zoneminder-nginx - Files needed for compatibility with the Nginx web server
 
    You can switch between different subpackages with dnf/yum. Be advised that,
-   switching between httpd <-> nginx requires manaully changing ownership of
+   switching between httpd <-> nginx requires manually changing ownership of
    all event folders and the php session folder after the change.
 
 4. The timezone must now be set from the ZoneMinder web console. See the

distros/redhat/readme/README.httpd

@@ -50,7 +50,7 @@ NOTE: EL7 users should replace "dnf" with "yum" in the instructions below.
 
    SELinux must be disabled or put into permissive mode. This is not optional!
 
-   To immediately disbale SELinux for the current seesion, issue the following
+   To immediately disable SELinux for the current session, issue the following
    from the command line:
 
      sudo setenforce 0
@@ -137,7 +137,7 @@ Upgrades
 
 3. Verify the ZoneMinder Apache configuration file in the folder 
    /etc/zm/www. You will have a file called "zoneminder.httpd.conf" and there
-   may also be one or more files with "rpmnew" extenstion. If the rpmnew file
+   may also be one or more files with "rpmnew" extension. If the rpmnew file
    exists, inspect it and merge anything new in that file with zoneminder.conf.
    Verify the SSL Requirements meet your needs. Read README.https if necessary.
 

distros/redhat/readme/README.https

@@ -1,13 +1,13 @@
 HTTPS is now the default
 ========================
 
-By default, ZoneMinder will use the certifciate created when the mod_ssl
-pacakge was installed on your system. 
+By default, ZoneMinder will use the certificate created when the mod_ssl
+package was installed on your system. 
 
 Since the certificate is self-signed, you will get a warning from your browser
 the first time you access the web portal. This is normal.
 
-This is not intended to be an all encompasing solution for everyone. ZoneMinder
+This is not intended to be an all encompassing solution for everyone. ZoneMinder
 will work just fine over HTTPS the way it is currently configured. However,
 here are a couple of considerations you may want to take to improve your
 experience.

distros/redhat/readme/README.nginx

@@ -48,7 +48,7 @@ New installs
 
    SELinux must be disabled or put into permissive mode. This is not optional!
 
-   To immediately disbale SELinux for the current seesion, issue the following
+   To immediately disable SELinux for the current session, issue the following
    from the command line:
 
      sudo setenforce 0

distros/redhat/zoneminder.spec

@@ -621,7 +621,7 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 - New contact email
 
 * Thu Mar 3 2016 Andrew Bauer <[email protected]> - 1.30.0-1 
-- Bump version fo 1.30.0 release.
+- Bump version for 1.30.0 release.
 
 * Sat Nov 21 2015 Andrew Bauer <[email protected]> - 1.29.0-1 
 - Bump version for 1.29.0 release on Fedora 23.
@@ -639,7 +639,7 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 - Add zmcamtool.pl. Bump version for 1.27 release. 
 
 * Mon Dec 16 2013 Andrew Bauer <[email protected]> - 1.26.5-1
-- This is a bug fixe release
+- This is a bug fix release
 - RTSP fixes, cmake enhancements, couple other misc fixes
 
 * Mon Oct 07 2013 Andrew Bauer <[email protected]> - 1.26.4-1

distros/ubuntu1504_cmake_split_packages/zoneminder-database.postinst

@@ -67,7 +67,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
     # Remove the password from debconf database
     test -z $ADMIN_PASSWORD || db_reset zoneminder/admin_password || true
 
-    # Get the lastest database version from dbconfig upgrade folder
+    # Get the latest database version from dbconfig upgrade folder
     DB_VERSION=$(ls -rv /usr/share/dbconfig-common/data/zoneminder/upgrade/$dbc_dbtypes | head -1)
 
     # Update the default admin account and database version