diff --git a/motion_config.html b/motion_config.html
index b4217461..830762b6 100644
--- a/motion_config.html
+++ b/motion_config.html
@@ -2992,19 +2992,22 @@
Default: Not defined
- The network camera high resolution URL. This option can be used in conjunction with the netcam_url for rtsp/rtmp cameras.
- Users may specify the normal resolution url in the netcam_url which will be used for the motion detection and then
- specify the high resolution url for this parameter. Motion detection on the normal resolution will trigger the saving
- of images from the high resolution stream. Note that the ONLY overlay that will be present on the resulting high
- resolution pictures and movies is the privacy mask. The other overlays such as date/time, motion boxes, camera
- name, etc will not be included. Users wishing to see those overlays on the resulting images and movies will need to
- specify the high resolution url as the netcam_url and not use this option.
+ The network camera high resolution URL. This option can be used in conjunction with the netcam_url for
+ rtsp/rtmp/mjpeg cameras. Users may specify the normal resolution url in the netcam_url which will be used for
+ the motion detection and then specify the high resolution url for this parameter. For mjpeg cameras,
+ the url must use the mjpeg prefix and not http.
+
+ Motion detection on the normal resolution will trigger the saving of images from the high resolution stream.
+ Note that the ONLY overlay that will be present on the resulting high resolution pictures and movies is the
+ privacy mask. The other overlays such as date/time, motion boxes, camera name, etc will not be
+ included. Users wishing to see those overlays on the resulting images and movies will need to specify the
+ high resolution url as the netcam_url and not use this option.
If the netcam_url is not specified, this option is ignored.
- When this option is used with the movie_passthrough even less processing occurs. Since
- the movie_passthrough bypasses decoding the stream, images will be saved only as normal
- resolution and the privacy mask will not be overlaid on to the high resolution images.
+ When this option is used with the movie_passthrough even less processing occurs.
+ Since the movie_passthrough bypasses decoding the stream, images will be saved
+ only as normal resolution and the privacy mask will not be overlaid on to the high resolution images.
netcam_userpass
@@ -4413,8 +4416,9 @@
Default: off
- When using a RTSP or RTMP camera, create movie files of the motion with the packets obtained directly from
- the camera.
+ When using a RTSP, RTMP or mjpeg camera, create movie files of the motion with the packets obtained directly
+ from the camera. For mjpeg cameras, the url must be specified using the mjpeg prefix rather than
+ as http
When using only the single netcam_url this option will reduce the processing
required when encoding the images to the resulting movie file. Decoding of the image will still occur on the