Merge branch 'main' into soon

config/config.example.js

@@ -104,13 +104,13 @@ module.exports = {
     /*
      *  CryptPad contains an administration panel. Its access is restricted to specific
      *  users using the following list.
-     *  To give access to the admin panel to a user account, just add their user id,
-     *  which can be found on the settings page for registered users.
+     *  To give access to the admin panel to a user account, just add their public signing
+     *  key, which can be found on the settings page for registered users.
      *  Entries should be strings separated by a comma.
      */
 /*
     adminKeys: [
-        //"https://my.awesome.website/user/#/1/cryptpad-user1/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=",
+        //"[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]",
     ],
 */
 

docs/example.nginx.conf

@@ -71,6 +71,9 @@ server {
     if ($args ~ ver=) {
         set $cacheControl max-age=31536000;
     }
+    if ($uri ~ ^/.*(\/|\.html)$) {
+        set $cacheControl no-cache;
+    }
     # Will not set any header if it is emptystring
     add_header Cache-Control $cacheControl;