Merge remote-tracking branch 'origin/master' into merge_test

docs/releases/2.1.5.rst

@@ -2,7 +2,7 @@
 Mayan EDMS v2.1.5 release notes
 ===============================
 
-Released: XX, 2016
+Released: November 8, 2016
 
 What's new
 ==========
@@ -21,6 +21,8 @@ Other changes
 - Backport zoom performance improvement (GitLab #334).
 - Backport trash can navigation link resolution fix (GitLab #331).
 - Improve documentation regarding the use of GPG version 1 (GitLab #333).
+- Fix ACL create view HTML response type. (GitLab #335).
+- Expland staging folder and watch folder explanation.
 
 Removals
 --------
@@ -79,5 +81,7 @@ Bugs fixed or issues closed
 * `GitLab issue #331 <https://gitlab.com/mayan-edms/mayan-edms/issues/331>`_ Trash List View: Items actions should be limited
 * `GitLab issue #333 <https://gitlab.com/mayan-edms/mayan-edms/issues/333>`_ "Unable to run gpg - it may not be available."
 * `GitLab issue #334 <https://gitlab.com/mayan-edms/mayan-edms/issues/334>`_ Perfomance improvment: prevent unnecessary image.resize in TransformationZoom
+* `GitLab issue #335 <https://gitlab.com/mayan-edms/mayan-edms/issues/335>`_ Wrong HTML Content-Type in ACL->NEW
+
 
 .. _PyPI: https://pypi.python.org/pypi/mayan-edms/

docs/topics/sources.rst

@@ -9,9 +9,6 @@ The current document sources supported are:
 - Web - ``HTML`` forms with a ``Browse`` button that will open the file dialog
   when clicked to allow selection of files in the user's computer to be
   uploaded as documents.
-- Staging folder - Folder where networked attached scanned can save image
-  files. The files in these staging folders are scanned and a preview is
-  generated to help the process of upload.
 - POP3 email - Provide the email, server and credential of a ``POP3`` based
   email to be scanned periodically for email. The body of the email is uploaded
   as a document and the attachments of the email are uploaded as separate
@@ -20,6 +17,19 @@ The current document sources supported are:
   the ``IMAP`` protocol.
 - Watch folder - A filesystem folder that is scanned periodically for files.
   Any file in the watch folder is automatically uploaded.
+- Staging folder - Folder where networked attached scanned can save image
+  files. The files in these staging folders are scanned and a preview is
+  generated to help the process of upload. Staging folders and Watch folders
+  work in a similar way with the main difference being that Staging folders are
+  interactive while Watch folders are automatic; documents in a Watch folder
+  are uploaded periodically and documents in a Staging folder remain indefinitely
+  there until an user uploads them. A preview for files in a Staging folder is
+  also provided. An example of Staging folder use is when multiple people
+  are scanning documents but only one person must be allowed to upload those
+  documents. This one person examines the scans quality and decides what to
+  upload and what to reject and have re-scanned. Watch folders can be used
+  when the quality of the scans is irrelevant or when they will be known
+  to be of good quality, such as when receiving e-faxes as PDFs.
 
 Document source can be configure to allow document bundles to uploaded as
 compressed files which are decompressed and their content uploaded as separate