Isaac Connor dfd7986c01 Merge branch 'master' into multi-server ...

Conflicts:
	distros/debian_cmake/links
	distros/ubuntu1504_cmake/zoneminder.postinst

2015-12-21 12:57:45 -05:00

..

images

content update

2015-08-23 16:51:37 -04:00

monitor/images

Adding screenshots for Options and Monitors

2014-11-18 16:55:36 +11:00

options

Add some documentation on Multi-Server

2015-12-19 20:51:19 +11:00

cameracontrol.rst

Merged control camera and controlling monitors into one document - they both talk about PTZ

2015-08-23 14:19:54 -04:00

components.rst

added missing zone images

2015-08-17 15:42:49 -04:00

definemonitor.rst

Add some documentation on Multi-Server

2015-12-19 20:51:19 +11:00

definezone.rst

Add Documentation for Privacy zones

2015-08-29 10:06:56 +02:00

filterevents.rst

added note about potential Perl and PHP time translation conflict with filters

2015-08-28 15:55:16 -04:00

gettingstarted.rst

Content update

2015-08-16 05:34:00 -04:00

index.rst

comtent update

2015-08-23 15:16:56 -04:00

introduction.rst

Initial attempt to migrate wiki to readthedocs

2014-07-13 22:25:30 +10:00

logging.rst

formatting

2015-08-23 18:41:13 -04:00

mobile.rst

updated mobile app info

2015-12-20 14:55:48 -05:00

options.rst

Final fixes for Options

2014-11-22 18:51:05 +11:00

viewevents.rst

content update

2015-08-23 16:41:29 -04:00

viewmonitors.rst

content update

2015-08-23 16:51:37 -04:00