Merge branch 'latest' into develop

OSC · Oct 22, 2024 · a62b9cd · a62b9cd
2 parents 6fc072c + f4afc05
commit a62b9cd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/source/customizations.rst b/source/customizations.rst
@@ -378,6 +378,20 @@ app.
 .. include:: customizations/main-navigation.inc
 .. include:: customizations/interactive-apps-menu.inc
 
+
+Disable uploads or downloads
+----------------------------
+
+By default, Open OnDemand will allow users to upload and download files.
+Both can be disabled through configuration.
+
+Use :ref:`download_enabled for disabling downloads <download_enabled>`
+and :ref:`upload_enabled for disabling uploads <upload_enabled>`.
+
+.. tip::
+  Use File Access Controls (FACLs) on the ondemand.d files to enable
+  or disable uploads or downloads based on group permissions.
+
 .. _set-upload-limits:
 
 Set Upload Limits

diff --git a/source/reference/files/ondemand-d-ymls.rst b/source/reference/files/ondemand-d-ymls.rst
@@ -760,6 +760,8 @@ Configuration Properties
 .. _upload_enabled:
 .. describe:: upload_enabled (Boolean, true)
 
+  .. versionadded:: 3.1
+
   Enable uploading files.
 
   Default
@@ -777,9 +779,11 @@ Configuration Properties
 
       upload_enabled: false
 
-.. _downlad_enabled:
+.. _download_enabled:
 .. describe:: download_enabled (Boolean, true)
 
+  .. versionadded:: 3.1
+
   Enable downloading files.
 
   Default

diff --git a/source/release-notes/v3.1-release-notes.rst b/source/release-notes/v3.1-release-notes.rst
@@ -263,7 +263,7 @@ Disabling uploads and downloads
 ...............................
 
 Sites can now disable uploads and downloads through the file
-browser.  See the configuration for :ref:`disabling downloads <downlad_enabled>`
+browser.  See the configuration for :ref:`disabling downloads <download_enabled>`
 and :ref:`disabling uploads <upload_enabled>` for how to configure this.
 
 Custom Javascript files