Merge branch 'master' into rtsp_server

This commit is contained in:
Isaac Connor 2021-01-25 15:10:53 -05:00
commit d6fef71302
2 changed files with 2 additions and 2 deletions

View File

@ -16,7 +16,7 @@ import sys
import os import os
def setup(app): def setup(app):
app.add_stylesheet('zmstyle.css') app.add_css_file('zmstyle.css')
# If extensions (or modules to document with autodoc) are in another directory, # If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the # add these directories to sys.path here. If the directory is relative to the

View File

@ -82,7 +82,7 @@ Install ZoneMinder for Nginx web server:
sudo dnf install zoneminder-nginx sudo dnf install zoneminder-nginx
|
Once ZoneMinder has been installed, you must read the README file to complete the installation. Fedora users can find the README under /usr/share/doc/zoneminder-common. RHEL/CentOS users can find the README under /usr/share/doc/zoneminder-common-x.xx where x.xx is the version of zoneminder. Once ZoneMinder has been installed, you must read the README file to complete the installation. Fedora users can find the README under /usr/share/doc/zoneminder-common. RHEL/CentOS users can find the README under /usr/share/doc/zoneminder-common-x.xx where x.xx is the version of zoneminder.
ZoneMinder will *NOT* run without completing the steps shown in the README! ZoneMinder will *NOT* run without completing the steps shown in the README!