Index: lams_build/conf/etherpad/etherpad-lite/settings.json
===================================================================
diff -u -r5d515ce1673823c66a63cfceb178b74f826d92a9 -r6c35e7bbcc3c98e9e3a1c31a367c44cb87bdf987
--- lams_build/conf/etherpad/etherpad-lite/settings.json	(.../settings.json)	(revision 5d515ce1673823c66a63cfceb178b74f826d92a9)
+++ lams_build/conf/etherpad/etherpad-lite/settings.json	(.../settings.json)	(revision 6c35e7bbcc3c98e9e3a1c31a367c44cb87bdf987)
@@ -403,14 +403,22 @@
    * WARNING: passwords should not be stored in plaintext in this file.
    *          If you want to mitigate this, please install ep_hash_auth and
    *          follow the section "secure your installation" in README.md
-   */
 
   "users": {
     "admin": {
+      // 1) "password" can be replaced with "hash" if you install ep_hash_auth
+      // 2) please note that if password is null, the user will not be created
       "password": "changeme1",
       "is_admin": true
+    },
+    "user": {
+      // 1) "password" can be replaced with "hash" if you install ep_hash_auth
+      // 2) please note that if password is null, the user will not be created
+      "password": "changeme1",
+      "is_admin": false
     }
   },
+  */
 
   /*
    * Restrict socket.io transport methods
@@ -458,7 +466,37 @@
    */
   "importMaxFileSize": 52428800, // 50 * 1024 * 1024
 
+
   /*
+   * From Etherpad 1.8.3 onwards import was restricted to authors who had
+   * content within the pad.
+   *
+   * This setting will override that restriction and allow any user to import
+   * without the requirement to add content to a pad.
+   *
+   * This setting is useful for when you use a plugin for authentication so you
+   * can already trust each user.
+   */
+  "allowAnyoneToImport": false, 
+
+  /*
+   * From Etherpad 1.9.0 onwards, when Etherpad is in production mode commits from individual users are rate limited
+   *
+   * The default is to allow at most 10 changes per IP in a 1 second window.
+   * After that the change is rejected.
+   *
+   * See https://github.com/animir/node-rate-limiter-flexible/wiki/Overall-example#websocket-single-connection-prevent-flooding for more options
+   */
+  "commitRateLimiting": {
+    // duration of the rate limit window (seconds)
+    "duration": 1,
+
+    // maximum number of chanes per IP to allow during the rate limit window
+    "points": 10
+  },
+
+
+  /*
    * Toolbar buttons configuration.
    *
    * Uncomment to customize.
@@ -485,6 +523,7 @@
       ["timeslider_export", "timeslider_returnToPad"]
     ]
   },
+  
 
   /*
    * Expose Etherpad version in the web interface and in the Server http header.
@@ -550,5 +589,8 @@
       */
 
       ]
-    } // logconfig
+    }, // logconfig
+
+  /* Override any strings found in locale directories */
+  "customLocaleStrings": {}
 }