Commit Graph

15 Commits

Author SHA1 Message Date
Isaac Connor 76f63686cb Merge branch 'fix_event_viewing' into storageareas 2017-06-22 09:24:31 -04:00
Martin Owens 6cc6055bd3 Fix spelling mistake in link 2017-06-17 21:50:41 -04:00
Isaac Connor b45da97416 need a blank line 2017-06-05 13:11:09 -04:00
Isaac Connor 9a317725c0 remove extra space 2017-06-05 13:10:16 -04:00
Andrew Bauer 02dac96cd9 more rst formatting changes
make the note about using ffmpeg over remote->rtsp in bold
2016-12-20 11:33:14 -06:00
Andrew Bauer 454894e3e8 fix rst formatting
It is amazing how seemingly small changes in whitespace significantly affect the formatting
2016-12-20 11:30:19 -06:00
Andy Bauer a20da2aa71 modify ffmpeg documentation, add a note to libvlc source type 2016-12-20 08:47:02 -06:00
Andy Bauer c25dd50a21 add Remote Protocol and Remote Method to the documentation 2016-12-20 08:30:21 -06:00
Andy Bauer 09937e87f7 mention 32 bit color depth and make it preferred 2016-12-20 08:16:10 -06:00
Andrew Bauer 3a804a0d0c Update definemonitor.rst 2016-08-06 16:34:00 -05:00
SteveGilvarry b78deb192b Add some documentation on Multi-Server 2015-12-19 20:51:19 +11:00
Andrew Bauer b798dfadbc Merge branch '1013-document-migration' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-1013-document-migration
Conflicts:
	docs/userguide/filterevents.rst
2015-08-24 09:48:40 -05:00
Pliable Pixels 0dcf38abc3 content 2015-08-23 14:13:11 -04:00
tikismoke f9347501f9 update doc
make it more readable on readthedoc
2015-08-22 19:31:54 +02:00
SteveGilvarry 9795967298 Initial attempt to migrate wiki to readthedocs 2014-07-13 22:25:30 +10:00