Merge 1.2.0 changes back to master.
diff --git a/src/chapters/configuring.xml b/src/chapters/configuring.xml
index 4f5ec43..2246ddb 100644
--- a/src/chapters/configuring.xml
+++ b/src/chapters/configuring.xml
@@ -974,6 +974,26 @@
</para>
</entry>
</row>
+ <row>
+ <entry><parameter>sftp-disable-download</parameter></entry>
+ <entry>
+ <para>If set to true downloads from the remote system to
+ the client (browser) will be disabled. The default is
+ false, which means that downloads will be enabled.</para>
+ <para>If sftp is not enabled, this parameter will be
+ ignored.</para>
+ </entry>
+ </row>
+ <row>
+ <entry><parameter>sftp-disable-upload</parameter></entry>
+ <entry>
+ <para>If set to true uploads from the client (browser) to
+ the remote system will be disabled. The default is
+ false, which means that uploads will be enabled.</para>
+ <para>If sftp is not enabled, this parameter will be
+ ignored.</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
@@ -2417,6 +2437,30 @@
</entry>
</row>
<row>
+ <entry><parameter>disable-download</parameter></entry>
+ <entry>
+ <para>If set to true downloads from the remote server to
+ client (browser) will be disabled. This includes both
+ downloads down via the hidden Guacamole menu, as well
+ as using the special "Download" folder presented to
+ the remote server. The default is false, which means
+ that downloads will be allowed.</para>
+ <para>If file transfer is not enabled, this parameter is
+ ignored.</para>
+ </entry>
+ </row>
+ <row>
+ <entry><parameter>disable-upload</parameter></entry>
+ <entry>
+ <para>If set to true, uploads from the client (browser)
+ to the remote server location will be disabled. The
+ default is false, which means uploads will be allowed
+ if file transfer is enabled.</para>
+ <para>If file transfer is not enabled, this parameter is
+ ignored.</para>
+ </entry>
+ </row>
+ <row>
<entry><parameter>drive-name</parameter></entry>
<entry>
<para>The name of the filesystem used when passed through to
@@ -2862,6 +2906,26 @@
</para>
</entry>
</row>
+ <row>
+ <entry><parameter>sftp-disable-download</parameter></entry>
+ <entry>
+ <para>If set to true downloads from the remote system to
+ the client (browser) will be disabled. The default is
+ false, which means that downloads will be enabled.</para>
+ <para>If sftp is not enabled, this parameter will be
+ ignored.</para>
+ </entry>
+ </row>
+ <row>
+ <entry><parameter>sftp-disable-upload</parameter></entry>
+ <entry>
+ <para>If set to true uploads from the client (browser) to
+ the remote system will be disabled. The default is
+ false, which means that uploads will be enabled.</para>
+ <para>If sftp is not enabled, this parameter will be
+ ignored.</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
@@ -4135,6 +4199,26 @@
the root directory will be used by default.</para>
</entry>
</row>
+ <row>
+ <entry><parameter>sftp-disable-download</parameter></entry>
+ <entry>
+ <para>If set to true downloads from the remote system to
+ the client (browser) will be disabled. The default is
+ false, which means that downloads will be enabled.</para>
+ <para>If sftp is not enabled, this parameter will be
+ ignored.</para>
+ </entry>
+ </row>
+ <row>
+ <entry><parameter>sftp-disable-upload</parameter></entry>
+ <entry>
+ <para>If set to true uploads from the client (browser) to
+ the remote system will be disabled. The default is
+ false, which means that uploads will be enabled.</para>
+ <para>If sftp is not enabled, this parameter will be
+ ignored.</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
