Merge branch '5.4' into 6.4

javiereguiluz · javiereguiluz · commit 48726ce0da8d · 2024-06-21T10:30:51.000+02:00
* 5.4:
  Minor tweak
  Update lock.rst
  Add reference to undocumented configuration option
diff --git a/components/lock.rst b/components/lock.rst
@@ -769,7 +769,7 @@ Using the above methods, a robust code would be::
             $lock->refresh();
         }
 
-        // Perform the task whose duration MUST be less than 5 minutes
+        // Perform the task whose duration MUST be less than 5 seconds
     }
 
 .. caution::

Original file line number	Diff line number	Diff line change
`@@ -769,7 +769,7 @@ Using the above methods, a robust code would be::`
`769`	`769`	`$lock->refresh();`
`770`	`770`	`}`
`771`	`771`
`772`		`- // Perform the task whose duration MUST be less than 5 minutes`
	`772`	`+ // Perform the task whose duration MUST be less than 5 seconds`
`773`	`773`	`}`
`774`	`774`
`775`	`775`	`.. caution::`