ZoneMinder · connortechnology · Aug 13, 2023 · Aug 12, 2023 · Aug 12, 2023
diff --git a/docs/api.rst b/docs/api.rst
@@ -414,7 +414,7 @@ This returns number of events per monitor that were recorded in the last one hou
 
   curl "http://server/zm/api/events/consoleEvents/1%20hour.json"
 
-This returns number of events per monitor that were recorded in the last day where there were atleast 10 frames that were alarms"
+This returns number of events per monitor that were recorded in the last day where there were at least 10 frames that were alarms"
 
 ::
 
@@ -645,7 +645,7 @@ will display a live feed from monitor id 1, scaled down by 50% in quality and re
 
 PTZ on live streams
 -------------------
-PTZ commands are pretty cryptic in ZoneMinder. This is not meant to be an exhaustive guide, but just something to whet your appetite:
+PTZ commands are pretty cryptic in ZoneMinder. This is not meant to be an exhaustive guide, but just something to wet your appetite:
 
 
 Lets assume you have a monitor, with ID=6. Let's further assume you want to pan it left.

diff --git a/docs/faq.rst b/docs/faq.rst
@@ -115,7 +115,7 @@ A sample output on Ubuntu:
 	tmpfs                      2.6G  923M  1.7G  36% /run/shm
 
 
-The key item here is tmpfs --> the example above shows we have allocated 1.7G of mapped memory space of which 36% is used which is a healthy number. If you are seeing ``Use%`` going beyond 70% you should probaby increase the mapped memory.
+The key item here is tmpfs --> the example above shows we have allocated 1.7G of mapped memory space of which 36% is used which is a healthy number. If you are seeing ``Use%`` going beyond 70% you should probably increase the mapped memory.
 
 For example, if you want to increase this limit to 70% of your memory, add the following to ``/etc/fstab``
 ``tmpfs SHMPATH tmpfs defaults,noexec,nosuid,size=70% 0 0``
@@ -432,7 +432,7 @@ Here are some commands to get information about your hardware. Some commands are
 * ``[[zmu]]  -m 0 -q -v`` -- Returns various information regarding a monitor configuration.
 * ``[[ipcs]] ``  -- Provides information on the ipc facilities for which the calling process has read access.
 * ``[[ipcrm]] ``  -- The ipcrm command can be used to remove an IPC object from the kernel.
-* ``cat /proc/interrupts``  -- This will dispaly what interrupts your hardware is using.
+* ``cat /proc/interrupts``  -- This will display what interrupts your hardware is using.
 
 Why am I getting a 403 access error with my web browser when trying to access http //localhost/zm?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst
@@ -70,7 +70,7 @@ To install the version in bookworm stable, just run the following command.
 
 If instead you prefer to install the newer version using backports, run the following commands.
 The first line will add this bookworm-backports repository.
-The backports repository is deactivated by default, so with the second line we explicityly state we want the backported version of zoneminder.
+The backports repository is deactivated by default, so with the second line we explicitly state we want the backported version of zoneminder.
 
 ::
 
@@ -171,7 +171,7 @@ To install the version in bullseye stable, just run the following command.
 
 If instead you prefer to install the newer version using backports, run the following commands.
 The first line will add bullseye-backports repository.
-The backports repository is deactivated by default, so with the second line we explicityly state we want the backported version of zoneminder.
+The backports repository is deactivated by default, so with the second line we explicitly state we want the backported version of zoneminder.
 
 ::
 

diff --git a/docs/installationguide/easydocker.rst b/docs/installationguide/easydocker.rst
@@ -1,6 +1,6 @@
 An Easy To Use Docker Image
 ===========================
-If you are interested in trying out ZoneMinder quickly, user Dan Landon maintains an easy to use docker image for ZoneMinder. With a few simple configuration changes, it also provides complete Event Notification Server and Machine Learning hook support. Please follow instructions in his repostory. He maintains two repositories:
+If you are interested in trying out ZoneMinder quickly, user Dan Landon maintains an easy to use docker image for ZoneMinder. With a few simple configuration changes, it also provides complete Event Notification Server and Machine Learning hook support. Please follow instructions in his repository. He maintains two repositories:
 
 * If you want to run the latest stable release, please use his `zoneminder machine learning repository <https://github.com/dlandon/zoneminder.machine.learning>`__.
 * If you want to run the latest zoneminder master, please use his `zoneminder master repository <https://github.com/dlandon/zoneminder.master-docker>`__.

diff --git a/docs/installationguide/multiserver.rst b/docs/installationguide/multiserver.rst
@@ -25,7 +25,7 @@ New installs
 
     For systemd based linux distros, inspect the zoneminder service file, typically found under /lib/systemd/system. Changes may be required for multiserver to function correctly. For example, the service file may check for a running instance of mysql or mariadb running locally on the server. This check will need to be removed. Rather than edit the service file directly, copy the service file to /etc/systemd/system and edit the file in that location.
 
-2. On each ZoneMinder server, edit zm.conf. Find the ZM_DB_HOST variable and set it to the name or ip address of your Database Server. Find the ZM_SERVER_HOST and enter a name for this ZoneMinder server. Use a name easily recognizable by you. This name is not used by ZoneMinder for dns or any other form of network conectivity.
+2. On each ZoneMinder server, edit zm.conf. Find the ZM_DB_HOST variable and set it to the name or ip address of your Database Server. Find the ZM_SERVER_HOST and enter a name for this ZoneMinder server. Use a name easily recognizable by you. This name is not used by ZoneMinder for dns or any other form of network connectivity.
 
 3. Copy the file /usr/share/zoneminder/db/zm_create.sql from one of the ZoneMinder Servers to the machine targeted as the Database Server.
 
@@ -52,7 +52,7 @@ Note that these commands are just an example and might not be secure enough for
 
 .. sidebar :: Note
 
-    The location of the ZoneMinder events folder varies by distro. This folder is often found under "/var/lib/zoneminder/events" for RedHat based distros and "/var/cache/zoneminder/events" for Debain based distros. This folder is NOT a Symbolic Link!
+    The location of the ZoneMinder events folder varies by distro. This folder is often found under "/var/lib/zoneminder/events" for RedHat based distros and "/var/cache/zoneminder/events" for Debian based distros. This folder is NOT a Symbolic Link!
 
 10. Open your browser and point it to the web console on any of the ZoneMinder Servers (they will all be the same). Open Options, click the Servers tab,and populate this screen with all of your ZoneMinder Servers. Each server has a field for its name and its hostname. The name is what you used for ZM_SERVER_HOST in step 2. The hostname is the network name or ip address ZoneMinder should use.
 

diff --git a/docs/installationguide/packpack.rst b/docs/installationguide/packpack.rst
@@ -27,7 +27,7 @@ Procedure
 
 - If the desired distro is not in the first list, then open the `packpack project README <https://github.com/packpack/packpack/blob/master/README.md>`_ and check if the desired distro is theoretically supported. If it is, then continue to step 2 with the understanding that you are heading out into uncharted territory. There could be problems. 
 
-- If the desired distro does not appear in either list, then unfortuantely you cannot use the procedure described here.
+- If the desired distro does not appear in either list, then unfortunately you cannot use the procedure described here.
 
 - If the desired distro architecture is arm, refer to `Appendix A - Enable Qemu On the Host`_ to enable qemu emulation on your amd64 host machine.
 

diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
@@ -73,7 +73,7 @@ Install ZoneMinder for Apache web server:
 
 .. sidebar :: Note
 
-    A virtual package called zoneminder exists. This package contains no files and will pull in the zoneminder-httpd package for backwards compatiblity.
+    A virtual package called zoneminder exists. This package contains no files and will pull in the zoneminder-httpd package for backwards compatibility.
 
 ::
 
@@ -213,7 +213,7 @@ Now clone the ZoneMinder git repository from your home folder:
 
 This will create a sub-folder called zoneminder, which will contain the latest development source code.
 
-If you have previsouly cloned the ZoneMinder git repo and wish to update it to the most recent, then issue these commands instead:
+If you have previously cloned the ZoneMinder git repo and wish to update it to the most recent, then issue these commands instead:
 
 ::
 

diff --git a/docs/userguide/definemonitor.rst b/docs/userguide/definemonitor.rst
@@ -150,7 +150,7 @@ Orientation
 WebSite
 ^^^^^^^
 
-This Source Type allows one to configure an arbitrary website as a non-recordable, fully interactive, monitor in ZoneMinder. Note that sites with self-signed certificates will not display until the end user first manually navigates to the site and accpets the unsigned certificate. Also note that some sites will set an X-Frame option in the header, which discourages their site from being displayed within a frame. ZoneMinder will detect this condition and present a warning in the log. When this occurs, the end user can choose to install a browser plugin or extension to workaround this issue.
+This Source Type allows one to configure an arbitrary website as a non-recordable, fully interactive, monitor in ZoneMinder. Note that sites with self-signed certificates will not display until the end user first manually navigates to the site and accepts the unsigned certificate. Also note that some sites will set an X-Frame option in the header, which discourages their site from being displayed within a frame. ZoneMinder will detect this condition and present a warning in the log. When this occurs, the end user can choose to install a browser plugin or extension to workaround this issue.
 
 Website URL 
     Enter the full http or https url to the desired website.

diff --git a/docs/userguide/filterevents.rst b/docs/userguide/filterevents.rst
@@ -34,7 +34,7 @@ Here is what the filter window looks like
   * Update used disk space: calculates how much disk space is currently taken by the event and updates the db record.
   * Create video for all matches: creates a video file of all the events that match 
   * Create video for all matches: ffmpeg will be used to create a video file (mp4) out of all the stored jpgs if using jpeg storage.
-	* Execute command on all matches: Allows you to execute any arbitrary command on the matched events. You can use replacement tokens as subsequent arguents to the command, the last argument will be the absolute path to the event, preceded by replacement arguents. eg: /usr/bin/script.sh %MN% will execute as /usr/bin/script.sh MonitorName /path/to/event. Please note that urls may contain characters like & that need quoting. So you may need to put quotes around them like /usr/bin/scrupt.sh "%MN%".
+	* Execute command on all matches: Allows you to execute any arbitrary command on the matched events. You can use replacement tokens as subsequent arguments to the command, the last argument will be the absolute path to the event, preceded by replacement arguments. eg: /usr/bin/script.sh %MN% will execute as /usr/bin/script.sh MonitorName /path/to/event. Please note that urls may contain characters like & that need quoting. So you may need to put quotes around them like /usr/bin/scrupt.sh "%MN%".
 	* Delete all matches: Deletes all the matched events.
 	* Email details of all matches: Sends an email to the configured address with details about the event. 
   * Copy all matches: copies the event files to another location, specified in the Copy To dropdown.  The other location must be setup in the Storage Tab under options.

diff --git a/docs/userguide/gettingstarted.rst b/docs/userguide/gettingstarted.rst
@@ -26,7 +26,7 @@ We strongly recommend enabling authentication right away. There are some situati
 * Enable OPT_USE_AUTH - this automatically switches to authentication mode with a default user (more on that later)
 * Select a random string for AUTH_HASH_SECRET - this is used to make the authentication logic more secure, so 
   please generate your own string and make sure it is sufficiently randomized and long. Note that if you plan to use APIs with ZoneMinder (needed by zmNinja/other apps), it is mandatory that you have this field populated
-* The other options highlighed above should already be set, but if not, please make sure they are
+* The other options highlighted above should already be set, but if not, please make sure they are
 * Note that if you are planning to use zmNinja and plan to use ZM authentication, you must also:
 
   * set ``AUTH_RELAY`` to hashed
@@ -112,7 +112,7 @@ This brings up the new monitor window:
 * In Analysis FPS, we've put in 5FPS here. Note that you should not put an FPS that is greater than the camera FPS. In my case, 5FPS is sufficient for my needs
 
 .. note::
-  Leave Maximum FPS and Alarm Maximum FPS **empty** if you are configuring an IP camera. In older versions of ZoneMinder, you were encouraged to put a value here, but that is no longer recommended. Infact, if you see your feed going much slower than the feed is supposed to go, or you get a lot of buffering/display issues, make sure this is empty. If you need to control camera FPS, please do it directly on the camera (via its own web interface, for example)
+  Leave Maximum FPS and Alarm Maximum FPS **empty** if you are configuring an IP camera. In older versions of ZoneMinder, you were encouraged to put a value here, but that is no longer recommended. In fact, if you see your feed going much slower than the feed is supposed to go, or you get a lot of buffering/display issues, make sure this is empty. If you need to control camera FPS, please do it directly on the camera (via its own web interface, for example)
 
 
 * We are done for the General tab. Let's move to the next tab

diff --git a/docs/userguide/options/options_api.rst b/docs/userguide/options/options_api.rst
@@ -2,7 +2,7 @@ Options - API
 ---------------
 
 .. note::
-  The ZoneMinder web interface does not use APIs and therefore, the tokens discussed here don't apply to the ZoneMinder UI. These only appy to apps that use the ZoneMinder API, like zmNinja.
+  The ZoneMinder web interface does not use APIs and therefore, the tokens discussed here don't apply to the ZoneMinder UI. These only apply to apps that use the ZoneMinder API, like zmNinja.
 
 The API option screen allows you enable/disable APIs on a per user basis. Furthermore, it also allows you to "revoke" tokens allotted to users. Starting ZoneMinder 1.34, the API ecosystem was overhauled and we now support JWT tokens with a concept of refresh tokens and access tokens. This allows for authentication without the need for sending passwords with each authentication request. For a more detailed understanding of how this works, please refer to :doc:`/api`. Over time, more control will be added to this screen.
 

diff --git a/docs/userguide/options/options_bw.rst b/docs/userguide/options/options_bw.rst
@@ -43,4 +43,4 @@ WEB_H_EVENTS_VIEW, WEB_M_EVENTS_VIEW, WEB_L_EVENTS_VIEW - Stored events can be v
 
 WEB_H_SHOW_PROGRESS, WEB_M_SHOW_PROGRESS, WEB_L_SHOW_PROGRESS - When viewing events an event navigation panel and progress bar is shown below the event itself. This allows you to jump to specific points in the event, but can can also dynamically update to display the current progress of the event replay itself. This progress is calculated from the actual event duration and is not directly linked to the replay itself, so on limited bandwidth connections may be out of step with the replay. This option allows you to turn off the progress display, whilst still keeping the navigation aspect, where bandwidth prevents it functioning effectively.
 
-WEB_H_AJAX_TIMEOUT, WEB_M_AJAX_TIMEOUT, WEB_L_AJAX_TIMEOUT - The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.
+WEB_H_AJAX_TIMEOUT, WEB_M_AJAX_TIMEOUT, WEB_L_AJAX_TIMEOUT - The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would otherwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.