[Pkg-owncloud-commits] [owncloud] 131/205: Rename experimental to transactional file locking

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit eadf789519cc4788439a962f9bda9be5f730e9f6
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Jun 26 11:10:10 2015 +0200

    Rename experimental to transactional file locking
---
 config/config.sample.php     | 6 +++---
 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 535b2c3..19e7843 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 fb6ef9b..a55071b 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>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git