Merge branch '7.0' into 7.1

javiereguiluz · javiereguiluz · commit c7b7abdb2720 · 2024-06-21T10:31:00.000+02:00
* 7.0:
  Update lock.rst
  Add reference to undocumented configuration option
diff --git a/components/lock.rst b/components/lock.rst
@@ -754,7 +754,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
`@@ -754,7 +754,7 @@ Using the above methods, a robust code would be::`
`754`	`754`	`$lock->refresh();`
`755`	`755`	`}`
`756`	`756`
`757`		`- // Perform the task whose duration MUST be less than 5 minutes`
	`757`	`+ // Perform the task whose duration MUST be less than 5 seconds`
`758`	`758`	`}`
`759`	`759`
`760`	`760`	`.. caution::`