Commit Graph

210 Commits

Author SHA1 Message Date
Isaac Connor 3dff8a5da5 update doc references to do_debian_package.sh 2017-04-24 17:01:24 -04:00
Joshua Ruehlig 6779bd74b0 Update multiserver.rst
No longer needed since https://github.com/ZoneMinder/ZoneMinder/pull/1470
2017-04-21 10:44:37 -07:00
Joshua Ruehlig 0728b935c0 Update ubuntu.rst
I'm not a linux/ubuntu guy, but I am 90% sure this is correct =P
2017-04-21 10:43:16 -07:00
Andrew Bauer 48e2c5f6ec Update redhat.rst 2017-04-14 12:40:32 -05:00
Andrew Bauer 8555b07f95 Update redhat.rst
update rpm building instructions to reflect latest changes
2017-04-01 08:26:27 -05:00
Andrew Bauer a40de3b588 Update redhat.rst
better way to create a tarball from a local git repo
2017-04-01 08:20:34 -05:00
Manojav Sridhar ca303da030 added documentation for feature that allows %tags% to passed as command line args to the exec command in addtion to the event path 2017-02-15 09:38:19 -05:00
Andrew Bauer e680941568 add motion zone preset disclaimer 2017-02-10 08:30:13 -06:00
SteveGilvarry 2f3ebd80da Remove zmf, die..die..die 2017-01-16 13:20:05 -08:00
Pliable Pixels 0f3642adf4 added uncompressed xml 2017-01-15 21:40:25 -05:00
Pliable Pixels d5d9a3a8e9 reminder message for website used to draw XML source images 2017-01-15 17:35:34 -05:00
Pliable Pixels 9bf83a409b fixed image type 2017-01-15 17:35:12 -05:00
Andrew Bauer b063d8d6aa Merge pull request #1728 from connortechnology/path_zms_message
Path zms message
2017-01-02 08:54:32 -06:00
Isaac Connor da1d801935 Merge branch 'path_zms_message' of github.com:ConnorTechnology/ZoneMinder into path_zms_message 2017-01-02 09:32:43 -05: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
Isaac Connor 38c31be720 typo fix pluging -> plugin 2016-12-19 22:02:44 -05:00
Isaac Connor 4e89298183 fix another typo and stop recommending that people use ZM_OPT_FAST_DELETE 2016-12-19 22:01:45 -05:00
Isaac Connor 8b726996f7 FAQ fixes, more text about zms problems in it, and adjust the socket_sendto error message to point to the FAQ entry that is relevant. 2016-12-19 21:36:39 -05:00
Kyle Johnson ae1abe99ab Merge pull request #1668 from zestysoft/Memory-Map-FAQ-Additional-Details
Add additional details to increasing mapped memory.
2016-11-04 11:24:15 -06:00
Ian b813b51f2b Revert "Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details"
This reverts commit aa74660aa4, reversing
changes made to 749a90f199.
2016-11-04 07:15:21 -07:00
Ian 1f8e497ab9 Fix FilteredPixels Mode description
The FilteredPixels mode description incorrectly states that
AlarmedPixel analysis happens twice.
2016-11-03 23:24:31 -07:00
Ian aa74660aa4 Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details 2016-11-03 23:08:05 -07:00
Ian 749a90f199 Add additional details to increasing mapped memory.
Other distro’s do not use /run/shm as the memory mapped path, so added
information to cover this case.

Also filtered the output of df to focus our attention on the only mount
points that matter here.
2016-11-03 22:43:07 -07:00
Ian 60794fab1e Change CREATE_ANALYSIS_IMAGES Help text
The existing help text didn’t fully explain how blobs play a part in
this functionality.
2016-11-03 15:58:16 -07:00
Don Law 28b18066a9 Fix name of OPT_USE_AUTH option in getting started guide. 2016-08-29 20:34:54 -04:00
Isaac Connor 872adc1c62 Merge pull request #1578 from erelson/patch-2
Minor API doc error fixes
2016-08-15 10:02:57 -04:00
Andrew Bauer 3a804a0d0c Update definemonitor.rst 2016-08-06 16:34:00 -05:00
Eric Relson b822deeb8c Minor API doc error fixes 2016-08-02 10:08:08 -07:00
Steve Gilvarry 24aeb91ef2 Merge pull request #1558 from onlyjob/spellcheck
spellcheck/codespell
2016-07-30 00:35:10 +10:00
Pliable Pixels dc916bba2c case typo 2016-07-23 08:04:46 -04:00
Pliable Pixels 45a62dc8d8 Added example of configs API edit 2016-07-23 08:03:15 -04:00
Dmitry Smirnov f1acc52913 spellcheck/codespell 2016-07-14 00:30:39 +10:00
Steve Gilvarry 5811ba7eda Swap to apt-get for debian 2016-07-05 23:10:03 +10:00
Steve Gilvarry 3a40f39d83 Fix 14.04 php.ini location and some more formatting issues 2016-07-05 07:52:37 +10:00
Steve Gilvarry 219289ee20 Consistency changes 2016-07-05 07:15:01 +10:00
Steve Gilvarry b2d1d688cc Updates to Ubuntu and Debian install guides 2016-07-03 20:21:13 +10:00
arjunrc e0c5b2a78f added consoleEvents API 2016-05-19 15:15:48 -04:00
arjunrc 13feb96811 added alarm apis 2016-05-19 15:06:41 -04:00
Pliable Pixels 859a55e1ef updated documentation to include runstates 2016-04-13 12:54:22 -04:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Andrew Bauer d412e8dc5c Update redhat.rst 2016-03-25 07:54:37 -05:00
Luke Cousins 0e54831072 Swapping back to vi as default editor 2016-03-24 15:15:58 +00:00
Luke Cousins 2ede18a614 Minor improvements to documentation 2016-03-21 22:47:45 +00:00
Jon Burgess b11f3bce53 Assume this was meant to be Asterisk, not Astericks. 2016-03-19 15:25:17 +00:00
Andrew Bauer fe46785e94 Update redhat.rst 2016-03-15 07:33:40 -05:00
Andrew Bauer 68a5e78efc Update redhat.rst 2016-03-15 07:30:31 -05:00
Andrew Bauer dcdb879637 Update redhat.rst 2016-03-15 07:24:15 -05:00
Andrew Bauer 4581379d45 Update redhat.rst
minor edits
2016-03-15 07:21:34 -05:00
Andy Bauer b7259b973a first formatting pass 2016-02-28 12:54:21 -06:00
Andy Bauer 35d013136f add redhat instructions to readthe docs 2016-02-28 12:27:04 -06:00
Andrew Bauer c138914edd Merge pull request #1251 from tikismoke/patch-1
Update gettingstarted.rst
2016-02-26 07:03:36 -06:00
SteveGilvarry d40bf89b17 Remove Phone BW settings used with mobile skin 2016-02-26 22:43:37 +11:00
SteveGilvarry 4837585601 Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
Conflicts:
	src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
Andrew Bauer 2fc1fc4380 use debian control file to auto-install deps 2016-02-22 09:18:46 -06:00
Andrew Bauer 918407bcae Merge pull request #1248 from pliablepixels/documentation
updated documentation for ubuntu
2016-02-22 09:05:53 -06:00
Dmitry Smirnov 0f63f4357d sphinx: fix warning "Title underline too short".
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 21:06:21 +11:00
Dmitry Smirnov 5bcc414038 codespell: misc. spelling corrections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
Andrew Bauer 6de2ab504c Explain ZM_SERVER_HOST in multiserver documentation 2016-02-03 12:40:30 -06:00
tikismoke f7bc8c7f0d Update gettingstarted.rst
Correct MODECT by NODECT if using zmTrigger
2016-01-26 20:14:49 +01:00
arjunrc 680ab0236c updated ubuntu instructions 2016-01-24 07:47:25 -05:00
arjunrc 0ef6d55e8f resolves #1231 - ubuntu package from source instructions added 2016-01-22 09:39:19 -05:00
Andy Bauer ea99b2a62a Move design notes out of the image. Assign Red and Green colors to Storage & dB Servers in the diagram. 2016-01-01 09:20:11 -06:00
Andrew Bauer d5ec34889e Merge pull request #1211 from SteveGilvarry/multiserver-docs
Adding multiserver documentation
2016-01-01 09:01:31 -06:00
Andrew Bauer fa8574c3d1 Modify network topology, consistency changes 2015-12-31 10:24:34 -06:00
SteveGilvarry 072c11fa82 Fix image border 2015-12-31 16:53:38 +11:00
SteveGilvarry 15fbf587db Fix heading indentation 2015-12-31 16:45:22 +11:00
SteveGilvarry 251d73ffe0 Edit Toc 2015-12-31 16:40:49 +11:00
SteveGilvarry 3c2c393de6 Initial draft of Multi-server install docs 2015-12-31 16:24:56 +11:00
Isaac Connor 8dc7b3cee1 Merge branch 'master' into multi-server 2015-12-24 15:13:35 -05:00
SteveGilvarry abda4411e9 Revert to Default Theme, RTD will use their own and local builds default sphinx theme 2015-12-23 19:34:31 +11:00
Isaac Connor bcb18b927b mention that you must set ZM_SERVER_NAME in /etc/zm/zm.conf 2015-12-21 13:05:56 -05:00
Isaac Connor 70cac99e17 fix claim that live view must be done on host server 2015-12-21 13:03:52 -05:00
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
arjunrc 6ccf36bc77 updated mobile app info 2015-12-20 14:55:48 -05:00
arjunrc cbea550d70 custom theming for ZM 2015-12-19 16:53:47 -05:00
arjunrc c4bdb127ce fixed custom style breaking rtd theme 2015-12-19 16:53:30 -05:00
arjunrc 2763c3d92e deleted 2015-12-19 13:40:21 -05:00
arjunrc 3fe64f8ce6 rtd theme 2015-12-19 13:38:54 -05:00
SteveGilvarry b78deb192b Add some documentation on Multi-Server 2015-12-19 20:51:19 +11:00
arjunrc b444061cc6 removed -master from ppa - when 1.29 releases it will be stable 2015-12-18 15:11:05 -05:00
arjunrc 511421bff1 rewrite 2015-12-18 15:08:56 -05:00
arjunrc 9e2b1ba3cb remove hardcoded version 2015-12-18 15:08:40 -05:00
Isaac Connor e4b0e74f69 merge master 2015-09-24 10:01:27 -04:00
Andrew Bauer f13dddb719 Update api.rst 2015-09-22 09:26:09 -05:00
Pliable Pixels 08e04afcd2 fixed security instructions with curl 2015-09-22 07:39:27 -04:00
Andrew Bauer 78cf7f1cf5 Merge pull request #1044 from schrorg/privacy-zone-docs
Add Documentation for Privacy zones
2015-08-29 08:16:25 -05:00
Robin Daermann e822265512 Add Documentation for Privacy zones 2015-08-29 10:06:56 +02:00
Pliable Pixels d014a34b9a added note about potential Perl and PHP time translation conflict with filters 2015-08-28 15:55:16 -04: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 cee933225f formatting 2015-08-23 18:41:13 -04:00
Pliable Pixels 6045acc2ac content update 2015-08-23 16:51:37 -04:00
Pliable Pixels 65c5d41f7c content update 2015-08-23 16:41:29 -04:00
Pliable Pixels 7f23f47aea added deprecation notice 2015-08-23 16:21:05 -04:00
Pliable Pixels 7253e837f3 content update 2015-08-23 16:15:23 -04:00
Pliable Pixels 16ff2093a1 comtent update 2015-08-23 15:58:40 -04:00
Pliable Pixels 52d5aa0c70 comtent update 2015-08-23 15:19:51 -04:00