Merge pull request #17190 from owncloud/lock-changelabel

Rename experimental to transactional file locking

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,
 

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>