Merge commit '1381cd05b' into anoa/dinsic_release_1_31_0

1 files changed, 3 insertions, 3 deletions

diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml

index 2d39de84be..ff5992f92d 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -2408,8 +2408,8 @@ password_config:
       #require_uppercase: true
 
 ui_auth:
-    # The number of milliseconds to allow a user-interactive authentication
-    # session to be active.
+    # The amount of time to allow a user-interactive authentication session
+    # to be active.
     #
     # This defaults to 0, meaning the user is queried for their credentials
     # before every action, but this can be overridden to allow a single
@@ -2420,7 +2420,7 @@ ui_auth:
     # Uncomment below to allow for credential validation to last for 15
     # seconds.
     #
-    #session_timeout: 15000
+    #session_timeout: "15s"
 
 
 # Configuration for sending emails from Synapse.