Merge branch 'master' into 4951-request-vm

[arvados.git] / apps / workbench / config / application.default.yml

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index f43e8c6e098135cd3837c5c3a327e3fafafb3fe5..8be89b854575cb788c6a3c89dfb24434b3a0281f 100644 (file)
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -185,13 +185,16 @@ common:
   issue_reporter_email_to: arvados@example.com
   support_email_address: arvados@example.com
 
+  # generic issue email from
+  email_from: arvados@example.com
+
   # filename suffixes for which view icon would be shown in collection show page
   filename_suffixes_with_view_icon: [txt, gif, jpeg, jpg, png, html, htm, pdf]
 
   # the maximum number of bytes to load in the log viewer
   log_viewer_max_bytes: 1000000
 
-  # Set anonymous user token to enable anonymous user access. You can get
+  # Set anonymous_user_token to enable anonymous user access. You can get
   # the token by running "bundle exec ./script/get_anonymous_user_token.rb"
-  # in the directory where you API server is running.
+  # in the directory where your API server is running.
   anonymous_user_token: false