Changes for 3.0.4 docs

bluecherrydvr · Jan 16, 2021 · 6b094f0 · 6b094f0
1 parent 42cbcb7
commit 6b094f0
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 14 deletions.
diff --git a/docs/img/global-schedule.png b/docs/img/global-schedule.png
diff --git a/docs/img/ipcamera-discovery-auth.png b/docs/img/ipcamera-discovery-auth.png
diff --git a/docs/img/ipcamera-discovery-list.png b/docs/img/ipcamera-discovery-list.png
diff --git a/docs/img/ipcamera-discovery.png b/docs/img/ipcamera-discovery.png
diff --git a/docs/img/ipcamera-manual-add.png b/docs/img/ipcamera-manual-add.png
diff --git a/docs/img/list-source.png b/docs/img/list-source.png
diff --git a/docs/img/systemlog-select.png b/docs/img/systemlog-select.png
diff --git a/docs/server-install.rst b/docs/server-install.rst
@@ -9,25 +9,17 @@ Server Installation
 Requirements
 ------------
 
-Version 2 supports Ubuntu LTS releases (Ubuntu 14.04 and Ubuntu 16.04), Debian Jessie and experimental support for CentOS 7.
-
-
-Ubuntu has two different x86 installation methods. The first is Ubuntu desktop, which will install Ubuntu along with the graphical interface. It is recommended that users without prior knowledge of Ubuntu or Linux use this method. You can also download our ISO image (bluecherry-v2-desktop-14.04-amd64.iso)
-
-
-The second installation method is Ubuntu Server. The installation is a text-based interface and significantly more complicated then the desktop method. By default, the installation will not include the graphical desktop, which some users prefer. It is recommended for customers with prior experience adding third party software repositories from a command line.
+Version 3 (beta) supports Ubuntu LTS releases (Ubuntu 16.04 and Ubuntu 18.04), Debian 9 (Stretch) and Debian 10 (Buster).  Support for CentOS has been removed.
 
 Installing Bluecherry from the Bluecherry repository
 ----------------------------------------------------
-Obtain download instructions
-
-
-If you haven’t purchased a software license from us, you can give our software a free 30 day spin by clicking here and you will be given the download instructions.
+Download instructions
 
-Copy and paste the commands to add our repository, or use the ISO to automate the install.
+Currently version 3 is in beta which means 'unstable'.  
 
-``sudo bash -c "$(wget -O - https://dl.bluecherrydvr.com/scripts/install)")"``
+Copy and paste the commands to add our repository to Ubuntu 16.04 / Ubuntu 18.04 / Ubuntu 20.04 / Debian 9 / Debian 10.
 
+sudo bash -c "$(wget -O - https://dl.bluecherrydvr.com/scripts/install-unstable)"::
 
 
 Installing the server

diff --git a/docs/setup-configuration.rst b/docs/setup-configuration.rst
@@ -38,17 +38,69 @@ Adding / Managing network (IP) cameras
 
 This section covers adding and managing analog cameras. A Bluecherry hardware compression card is required for use with analog cameras and our software.
 
-.. image:: img/webui-sections.png
+.. Tip:: It is recommended that you change the 'List Source' from 'Local' to 'Live' in General Settings -> Performance/connectivity.  This will allow you to recieve the last list of manufacturers and model numbers.
+
+.. image:: img/list-source.png
 
+Manually adding network (IP) cameras
+------------------------------------
 
 **Select Devices from the menu**
 
 .. image:: img/devices-list.png
 
+
 **By default the ‘IP Cameras’ section is minimized.**
 
 .. image:: img/devices-list-ip.png
 
+.. Tip:: Always make sure your IP cameras are set to a static IP.  If the IP camera is setup with dynamic (DHCP) and the IP address changes Bluecherry will not be able to connect to the IP camera.
+
+**Devices -> Add an IP cameras**
+
+.. image:: img/ipcamera-manual-add.png
+
+If you already know the RTSP path you can select 'Generic' and update the Camera name (used in Bluecherry to show events), Camera IP or host, Username, Password.
+
+Video source stream should always be RTSP, only use MJPEG if you know for sure what you are doing.
+Path to RTSP.  This should always have a forward slash (/) followed by the RTSP path for the model of your IP camera (example - /media/video).  A quick Google search can usually provide you the RTSP path, or use the manufacturer list above to try to populate this for you.
+RTSP port.  *Most* IP camera manufacturers, with the exception of ACTi and some Hikvision cameras, use the default port of 554.  
+Transport.  Usually this is TCP, some manufacturers like ACTi use RTSP over UDP.
+ONVIF port.  Defaults to port 80, currently not used by Bluecherry and added for future releases.
+
+Once this you've completed this section click Add camera then test your configuration in the Bluecherry client or Bluecherry web interface.  Optionally you can look at /var/log/bluecherry.log to see if the IP camera was successfully connected to by Bluecherry.
+
+Automatic discovery of IP cameras
+---------------------------------
+
+**Select Devices from the menu**
+
+.. image:: img/devices-list.png
+
+**By default the ‘IP Cameras’ section is minimized.**
+
+.. image:: img/devices-list-ip.png
+
+.. Warning:: Currently this is still in development and may not work as expected and can take up to two minutes to run.
+
+**Devices -> Discover IP Cameras -> Find cameras**
+
+.. image:: img/ipcamera-discovery.png
+
+A list of the IP addresses and model numbers (if available) will be listed of any device that Bluecherry can autodetect.  If your IP camera is NOT in this list then follow the Manually adding network (IP) cameras section.
+
+.. image:: img/ipcamera-discovery-list.png
+
+Click on the checkbox next to the camera you wish to add then click 'Add camera'
+
+.. image:: img/ipcamera-discovery-auth.png
+
+Complete the login and password for the camera then click 'Add selected camera'
+
+Once this you've completed this section click Add camera then test your configuration in the Bluecherry client or Bluecherry web interface.  Optionally you can look at /var/log/bluecherry.log to see if the IP camera was successfully connected to by Bluecherry.
+
+
+.. image:: img/webui-sections.png
 
 Recording schedules
 ------------------