diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-06-26 11:10:10 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-06-26 11:10:10 +0200 |
| commit | eadf789519cc4788439a962f9bda9be5f730e9f6 (patch) | |
| tree | cd15a63ada9310827f384ebd5548ba23930880c2 | |
| parent | 9be1d08c3cb669f4829b0aa4af53d90cf3a9d153 (diff) | |
| download | nextcloud-server-eadf789519cc4788439a962f9bda9be5f730e9f6.tar.gz nextcloud-server-eadf789519cc4788439a962f9bda9be5f730e9f6.zip | |
Rename experimental to transactional file locking
| -rw-r--r-- | config/config.sample.php | 6 | ||||
| -rw-r--r-- | settings/templates/admin.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 535b2c3a5cc..19e7843d6c9 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1025,14 +1025,14 @@ $CONFIG = array( /** - * Enables the EXPERIMENTAL file locking. - * This is disabled by default as it is experimental. + * Enables transactional file locking. + * This is disabled by default as it is still beta. * * Prevents concurrent processes to access the same files * at the same time. Can help prevent side effects that would * be caused by concurrent operations. * - * WARNING: EXPERIMENTAL + * WARNING: BETA quality */ 'filelocking.enabled' => false, diff --git a/settings/templates/admin.php b/settings/templates/admin.php index fb6ef9b3e77..a55071bdf84 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -533,9 +533,9 @@ if ($_['cronErrors']) { <ul> <li> <?php if ($_['fileLockingEnabled']) { - p($l->t('Experimental File Lock is enabled.')); + p($l->t('Transactional File Locking is enabled.')); } else { - p($l->t('Experimental File Lock is disabled.')); + p($l->t('Transactional File Locking is disabled.')); } ?> </li> </ul> |